diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-12 23:25:42 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-12 23:25:42 +0200 |
| commit | 4e7bcad58fa682a360b3f8386eb0cd8c91577fb3 (patch) | |
| tree | 9064ac540794c6389b95e2881799e5ee2e4a33a1 | |
| parent | Merge pull request #1712 (diff) | |
| parent | Fixup choice of easylogging++ vs libunwind stack trace code (diff) | |
| download | monero-4e7bcad58fa682a360b3f8386eb0cd8c91577fb3.tar.xz | |
Merge pull request #1713
422ecc98 Fixup choice of easylogging++ vs libunwind stack trace code (moneromooo-monero)
| -rw-r--r-- | contrib/epee/include/misc_log_ex.h | 5 | ||||
| -rw-r--r-- | external/easylogging++/easylogging++.h | 3 | ||||
| -rw-r--r-- | src/common/stack_trace.cpp | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h index b1685f382..ae61965fa 100644 --- a/contrib/epee/include/misc_log_ex.h +++ b/contrib/epee/include/misc_log_ex.h @@ -51,8 +51,9 @@ #define ELPP_THREAD_SAFE #define ELPP_DEFAULT_LOG_FILE "" -#ifndef __ANDROID__ -#define ELPP_STACKTRACE_ON_CRASH 0 +#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 diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index 24e271e80..1cf9dbac8 100644 --- a/external/easylogging++/easylogging++.h +++ b/external/easylogging++/easylogging++.h @@ -198,12 +198,15 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre # if (ELPP_COMPILER_GCC && !ELPP_MINGW) # define ELPP_STACKTRACE 1 # else +# define ELPP_STACKTRACE 0 # if ELPP_COMPILER_MSVC # pragma message("Stack trace not available for this compiler") # else # warning "Stack trace not available for this compiler"; # endif // ELPP_COMPILER_MSVC # endif // ELPP_COMPILER_GCC +#else +# define ELPP_STACKTRACE 0 #endif // (defined(ELPP_STACKTRACE_ON_CRASH)) // Miscellaneous macros #define ELPP_UNUSED(x) (void)x diff --git a/src/common/stack_trace.cpp b/src/common/stack_trace.cpp index 67065aae7..ef64c20c5 100644 --- a/src/common/stack_trace.cpp +++ b/src/common/stack_trace.cpp @@ -26,7 +26,7 @@ // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ +#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__ #define USE_UNWIND #endif |