aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-02-11 00:40:17 +0200
committerRiccardo Spagni <ric@spagni.net>2017-02-11 00:40:17 +0200
commit9ed3e1bb6a59ccb3d72b5ea1cceb2dc8272fb63a (patch)
tree01faed0b09e709b55a3cb0c2b1fdb2bd1137ad91
parentMerge pull request #1689 (diff)
parentdisable ELPP_STACKTRACE_ON_CRASH for android (diff)
downloadmonero-9ed3e1bb6a59ccb3d72b5ea1cceb2dc8272fb63a.tar.xz
Merge pull request #1693
5d00659e disable ELPP_STACKTRACE_ON_CRASH for android (MoroccanMalinois)
-rw-r--r--contrib/epee/include/misc_log_ex.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h
index fbfd6941f..b1685f382 100644
--- a/contrib/epee/include/misc_log_ex.h
+++ b/contrib/epee/include/misc_log_ex.h
@@ -51,7 +51,9 @@
#define ELPP_THREAD_SAFE
#define ELPP_DEFAULT_LOG_FILE ""
+#ifndef __ANDROID__
#define ELPP_STACKTRACE_ON_CRASH 0
+#endif
#define ELPP_DISABLE_DEFAULT_CRASH_HANDLING
#define ELPP_FEATURE_CRASH_LOG 1
#define ELPP_DISABLE_CHECK_MACROS