diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-03-25 19:06:14 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-04-10 21:05:02 +0100 |
| commit | a8ac4f0a70cc433723cfc171d8a1b8f2b3287a33 (patch) | |
| tree | 341e24925517e9081682fdb799a2b0c4dfc83d86 /contrib/epee | |
| parent | Merge pull request #1930 (diff) | |
| download | monero-a8ac4f0a70cc433723cfc171d8a1b8f2b3287a33.tar.xz | |
update easylogging++ to latest upstream
Diffstat (limited to 'contrib/epee')
| -rw-r--r-- | contrib/epee/include/misc_log_ex.h | 9 | ||||
| -rw-r--r-- | contrib/epee/src/CMakeLists.txt | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h index ae61965fa..f4b28f9b1 100644 --- a/contrib/epee/include/misc_log_ex.h +++ b/contrib/epee/include/misc_log_ex.h @@ -49,15 +49,6 @@ #include <boost/filesystem.hpp> #include <boost/algorithm/string.hpp> -#define ELPP_THREAD_SAFE -#define ELPP_DEFAULT_LOG_FILE "" -#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__ -#else -#define ELPP_STACKTRACE_ON_CRASH 1 -#endif -#define ELPP_DISABLE_DEFAULT_CRASH_HANDLING -#define ELPP_FEATURE_CRASH_LOG 1 -#define ELPP_DISABLE_CHECK_MACROS #include "easylogging++.h" #define MONERO_DEFAULT_LOG_CATEGORY "default" diff --git a/contrib/epee/src/CMakeLists.txt b/contrib/epee/src/CMakeLists.txt index 1e79755e5..9db4c46ce 100644 --- a/contrib/epee/src/CMakeLists.txt +++ b/contrib/epee/src/CMakeLists.txt @@ -41,6 +41,7 @@ endif() target_link_libraries(epee PUBLIC crypto + easylogging ${Boost_FILESYSTEM_LIBRARY} PRIVATE ${EXTRA_LIBRARIES}) |