diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-18 09:18:21 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-18 09:52:50 +0200 |
| commit | b8e56aa8effdf586491b341cae355948cbc77e6a (patch) | |
| tree | ac8b7e51aae69e71af21468245798ec9b8be3a65 /src/init.cpp | |
| parent | 5a514c35bcff262c1759a29e21678d0cd79bd92e (diff) | |
| parent | 92a6220711b3f98c3daad8a8dcdf13f09ce484fd (diff) | |
| download | bitcoin-b8e56aa8effdf586491b341cae355948cbc77e6a.tar.xz | |
Merge pull request #4339
92a6220 sanity: hook up sanity checks (Cory Fields)
679240d sanity: add libc/stdlib sanity checks (Cory Fields)
11404af sanity: autoconf check for sys/select.h (Cory Fields)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index 6ad2c58c8f..6eab273526 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -31,6 +31,7 @@ #ifndef WIN32 #include <signal.h> #endif +#include "compat/sanity.h" #include <boost/algorithm/string/predicate.hpp> #include <boost/filesystem.hpp> @@ -424,8 +425,8 @@ bool InitSanityCheck(void) "information, visit https://en.bitcoin.it/wiki/OpenSSL_and_EC_Libraries"); return false; } - - // TODO: remaining sanity checks, see #4081 + if (!glibc_sanity_test() || !glibcxx_sanity_test()) + return false; return true; } |