diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/db_drivers/liblmdb/mdb.c | 6 | ||||
| -rw-r--r-- | external/easylogging++/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | external/easylogging++/ea_config.h | 3 | ||||
| -rw-r--r-- | external/easylogging++/easylogging++.cc | 3 | ||||
| -rw-r--r-- | external/easylogging++/easylogging++.h | 6 | ||||
| -rw-r--r-- | external/unbound/validator/val_secalgo.c | 4 |
6 files changed, 26 insertions, 7 deletions
diff --git a/external/db_drivers/liblmdb/mdb.c b/external/db_drivers/liblmdb/mdb.c index c2408f917..3552bd2a9 100644 --- a/external/db_drivers/liblmdb/mdb.c +++ b/external/db_drivers/liblmdb/mdb.c @@ -137,7 +137,7 @@ typedef SSIZE_T ssize_t; #include <unistd.h> #endif -#if defined(__sun) || defined(ANDROID) +#if defined(__sun) || defined(__ANDROID__) /* Most platforms have posix_memalign, older may only have memalign */ #define HAVE_MEMALIGN 1 #include <malloc.h> @@ -153,7 +153,7 @@ typedef SSIZE_T ssize_t; # define MDB_USE_SYSV_SEM 1 # endif # define MDB_FDATASYNC fsync -#elif defined(ANDROID) +#elif defined(__ANDROID__) # define MDB_FDATASYNC fsync #endif @@ -298,7 +298,7 @@ union semun { */ #ifndef MDB_USE_ROBUST /* Android currently lacks Robust Mutex support. So does glibc < 2.4. */ -# if defined(MDB_USE_POSIX_MUTEX) && (defined(ANDROID) || \ +# if defined(MDB_USE_POSIX_MUTEX) && (defined(__ANDROID__) || \ (defined(__GLIBC__) && GLIBC_VER < 0x020004)) # define MDB_USE_ROBUST 0 # else diff --git a/external/easylogging++/CMakeLists.txt b/external/easylogging++/CMakeLists.txt index d8d061db0..ae7d931cf 100644 --- a/external/easylogging++/CMakeLists.txt +++ b/external/easylogging++/CMakeLists.txt @@ -43,3 +43,14 @@ target_link_libraries(easylogging PRIVATE ${CMAKE_THREAD_LIBS_INIT}) +# GUI/libwallet install target +if (BUILD_GUI_DEPS) + if(IOS) + set(lib_folder lib-${ARCH}) + else() + set(lib_folder lib) + endif() + install(TARGETS easylogging + ARCHIVE DESTINATION ${lib_folder}) +endif() + diff --git a/external/easylogging++/ea_config.h b/external/easylogging++/ea_config.h index 3e6ed6e8c..2524d3477 100644 --- a/external/easylogging++/ea_config.h +++ b/external/easylogging++/ea_config.h @@ -4,8 +4,7 @@ #define ELPP_DEFAULT_LOG_FILE "" #if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__ #else -#define ELPP_STACKTRACE_ON_CRASH 1 +#define ELPP_FEATURE_CRASH_LOG 1 #endif #define ELPP_DISABLE_DEFAULT_CRASH_HANDLING -#define ELPP_FEATURE_CRASH_LOG 1 #define ELPP_NO_CHECK_MACROS diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc index 3e8463fdf..efa876664 100644 --- a/external/easylogging++/easylogging++.cc +++ b/external/easylogging++/easylogging++.cc @@ -990,7 +990,7 @@ std::string OS::getProperty(const char* prop) { return ret == 0 ? std::string() : std::string(propVal); } -static std::string OS::getDeviceName(void) { +std::string OS::getDeviceName(void) { std::stringstream ss; std::string manufacturer = getProperty("ro.product.manufacturer"); std::string model = getProperty("ro.product.model"); @@ -2095,6 +2095,7 @@ Storage::Storage(const LogBuilderPtr& defaultLogBuilder) : sysLogLogger->reconfigure(); #endif // defined(ELPP_SYSLOG) addFlag(LoggingFlag::AllowVerboseIfModuleNotSpecified); + addFlag(LoggingFlag::CreateLoggerAutomatically); #if ELPP_ASYNC_LOGGING installLogDispatchCallback<base::AsyncLogDispatchCallback>(std::string("AsyncLogDispatchCallback")); #else diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index 195df7e5c..8f592899e 100644 --- a/external/easylogging++/easylogging++.h +++ b/external/easylogging++/easylogging++.h @@ -290,7 +290,11 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre #define ELPP_VARIADIC_TEMPLATES_SUPPORTED \ (ELPP_COMPILER_GCC || ELPP_COMPILER_CLANG || ELPP_COMPILER_INTEL || (ELPP_COMPILER_MSVC && _MSC_VER >= 1800)) // Logging Enable/Disable macros -#define ELPP_LOGGING_ENABLED (!defined(ELPP_DISABLE_LOGS)) +#ifdef ELPP_DISABLE_LOGS +# define ELPP_LOGGING_ENABLED 0 +#else +# define ELPP_LOGGING_ENABLED 1 +#endif #if (!defined(ELPP_DISABLE_DEBUG_LOGS) && (ELPP_LOGGING_ENABLED)) # define ELPP_DEBUG_LOG 1 #else diff --git a/external/unbound/validator/val_secalgo.c b/external/unbound/validator/val_secalgo.c index 7c8d7b287..256c3ff92 100644 --- a/external/unbound/validator/val_secalgo.c +++ b/external/unbound/validator/val_secalgo.c @@ -345,7 +345,11 @@ setup_key_digest(int algo, EVP_PKEY** evp_key, const EVP_MD** digest_type, "EVP_PKEY_assign_DSA failed"); return 0; } +#ifdef HAVE_EVP_DSS1 *digest_type = EVP_dss1(); +#else + *digest_type = EVP_sha1(); +#endif break; case LDNS_RSASHA1: |