diff options
| author | ston1th <ston1th@giftfish.de> | 2017-12-09 10:01:31 +0100 |
|---|---|---|
| committer | ston1th <ston1th@giftfish.de> | 2017-12-09 10:01:31 +0100 |
| commit | 5cc8469332c800e6cd4aea4db5a9aef77251263b (patch) | |
| tree | 67b41ea675cb3a861bf38834f965640f213c04f8 /external/easylogging++ | |
| parent | Merge pull request #2883 (diff) | |
| download | monero-5cc8469332c800e6cd4aea4db5a9aef77251263b.tar.xz | |
easylogging: show the 'no stack trace' warning only once
If execinfo.h is not available, output the stack trace warning only once, so we don't spam the build logs with it.
Diffstat (limited to 'external/easylogging++')
| -rw-r--r-- | external/easylogging++/easylogging++.cc | 1 | ||||
| -rw-r--r-- | external/easylogging++/easylogging++.h | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc index 6bc6b2619..31b201897 100644 --- a/external/easylogging++/easylogging++.cc +++ b/external/easylogging++/easylogging++.cc @@ -14,6 +14,7 @@ // http://muflihun.com // +#define EASYLOGGING_CC #include "easylogging++.h" #if defined(AUTO_INITIALIZE_EASYLOGGINGPP) diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index 469cf9eec..3270bd607 100644 --- a/external/easylogging++/easylogging++.h +++ b/external/easylogging++/easylogging++.h @@ -203,16 +203,17 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre # if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD) # define ELPP_STACKTRACE 1 # else -# define ELPP_STACKTRACE 0 +# define ELPP_STACKTRACE 0 +# ifdef EASYLOGGING_CC # if ELPP_COMPILER_MSVC -# pragma message("Stack trace not available for this compiler") +# pragma message("Stack trace not available for this compiler") # else -# warning "Stack trace not available for this compiler"; +# warning "Stack trace not available for this compiler"; # endif // ELPP_COMPILER_MSVC -# define ELPP_STACKTRACE 0 +# endif # endif // ELPP_COMPILER_GCC #else -# define ELPP_STACKTRACE 0 +# define ELPP_STACKTRACE 0 #endif // (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG)) // Miscellaneous macros #define ELPP_UNUSED(x) (void)x |