diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/easylogging++/ea_config.h | 10 | ||||
| -rw-r--r-- | external/easylogging++/easylogging++.cc | 5 | ||||
| -rw-r--r-- | external/unbound/CMakeLists.txt | 1 |
3 files changed, 10 insertions, 6 deletions
diff --git a/external/easylogging++/ea_config.h b/external/easylogging++/ea_config.h index 2524d3477..c97858f30 100644 --- a/external/easylogging++/ea_config.h +++ b/external/easylogging++/ea_config.h @@ -2,9 +2,11 @@ #define ELPP_THREAD_SAFE #define ELPP_DEFAULT_LOG_FILE "" -#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__ -#else -#define ELPP_FEATURE_CRASH_LOG 1 -#endif #define ELPP_DISABLE_DEFAULT_CRASH_HANDLING #define ELPP_NO_CHECK_MACROS +#define ELPP_WINSOCK2 +#define ELPP_NO_DEBUG_MACROS + +#ifdef EASYLOGGING_CC +#define ELPP_FEATURE_CRASH_LOG +#endif diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc index 31b201897..57742b2e5 100644 --- a/external/easylogging++/easylogging++.cc +++ b/external/easylogging++/easylogging++.cc @@ -1016,8 +1016,9 @@ const std::string OS::getBashOutput(const char* command) { char hBuff[4096]; if (fgets(hBuff, sizeof(hBuff), proc) != nullptr) { pclose(proc); - if (hBuff[strlen(hBuff) - 1] == '\n') { - hBuff[strlen(hBuff) - 1] = '\0'; + const size_t len = strlen(hBuff); + if (len > 0 && hBuff[len - 1] == '\n') { + hBuff[len- 1] = '\0'; } return std::string(hBuff); } diff --git a/external/unbound/CMakeLists.txt b/external/unbound/CMakeLists.txt index a2e475232..99ef62c5a 100644 --- a/external/unbound/CMakeLists.txt +++ b/external/unbound/CMakeLists.txt @@ -53,6 +53,7 @@ add_definitions(-std=c99) option(USE_ECDSA "Use ECDSA algorithms" ON) option(USE_SHA2 "Enable SHA2 support" ON) +option(USE_SHA1 "Enable SHA1 support" ON) set(ENABLE_DNSTAP 0) set(HAVE_SSL 1) if (CMAKE_USE_PTHREADS_INIT AND NOT CMAKE_USE_WIN32_THREADS_INIT) |