aboutsummaryrefslogtreecommitdiff
path: root/contrib/epee
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/epee')
-rw-r--r--contrib/epee/include/misc_log_ex.h5
-rw-r--r--contrib/epee/src/mlog.cpp4
2 files changed, 5 insertions, 4 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/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp
index 7f9ef4b3a..c212456f6 100644
--- a/contrib/epee/src/mlog.cpp
+++ b/contrib/epee/src/mlog.cpp
@@ -142,7 +142,7 @@ void mlog_configure(const std::string &filename_base, bool console)
void mlog_set_categories(const char *categories)
{
el::Loggers::setCategories(categories);
- MINFO("Mew log categories: " << categories);
+ MGINFO("New log categories: " << categories);
}
// maps epee style log level to new logging system
@@ -150,7 +150,7 @@ void mlog_set_log_level(int level)
{
const char *categories = get_default_categories(level);
el::Loggers::setCategories(categories);
- MINFO("Mew log categories: " << categories);
+ MGINFO("New log categories: " << categories);
}
void mlog_set_log(const char *log)