diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/easylogging++/ea_config.h | 3 | ||||
| -rw-r--r-- | external/easylogging++/easylogging++.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/external/easylogging++/ea_config.h b/external/easylogging++/ea_config.h index 3e6ed6e8c..2524d3477 100644 --- a/external/easylogging++/ea_config.h +++ b/external/easylogging++/ea_config.h @@ -4,8 +4,7 @@ #define ELPP_DEFAULT_LOG_FILE "" #if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__ #else -#define ELPP_STACKTRACE_ON_CRASH 1 +#define ELPP_FEATURE_CRASH_LOG 1 #endif #define ELPP_DISABLE_DEFAULT_CRASH_HANDLING -#define ELPP_FEATURE_CRASH_LOG 1 #define ELPP_NO_CHECK_MACROS diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc index 3e8463fdf..4fbb94b25 100644 --- a/external/easylogging++/easylogging++.cc +++ b/external/easylogging++/easylogging++.cc @@ -990,7 +990,7 @@ std::string OS::getProperty(const char* prop) { return ret == 0 ? std::string() : std::string(propVal); } -static std::string OS::getDeviceName(void) { +std::string OS::getDeviceName(void) { std::stringstream ss; std::string manufacturer = getProperty("ro.product.manufacturer"); std::string model = getProperty("ro.product.model"); |