nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2940

Browse Source 
da0fd71d only include the easylogging++ stack trace code when needed (moneromooo-monero)
81b04cfa easlogging++: omit some unneded macros (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-12-28 08:57:59 +02:00
commit 8980aacbe8
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
external/easylogging++/ea_config.h vendored
View File

@ -2,10 +2,11 @@
#define ELPP_THREAD_SAFE #define ELPP_THREAD_SAFE
#define ELPP_DEFAULT_LOG_FILE "" #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_DISABLE_DEFAULT_CRASH_HANDLING
#define ELPP_NO_CHECK_MACROS #define ELPP_NO_CHECK_MACROS
#define ELPP_WINSOCK2 #define ELPP_WINSOCK2
#define ELPP_NO_DEBUG_MACROS
#ifdef EASYLOGGING_CC
#define ELPP_FEATURE_CRASH_LOG
#endif

3
src/common/stack_trace.cpp
View File

@ -28,7 +28,10 @@
#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__ #if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__
#define USE_UNWIND #define USE_UNWIND
#else
#define ELPP_FEATURE_CRASH_LOG 1
#endif #endif
#include "easylogging++/easylogging++.h"
#include <stdexcept> #include <stdexcept>
#ifdef USE_UNWIND #ifdef USE_UNWIND