Merge pull request #545 from costinm/patch-1

Allow compilation on platforms with unwind (android)
8 years ago · 6fd5f3c866
parent 47c17be9a1 f4f3e3fb66
commit 6fd5f3c866
1 changed files with 1 additions and 1 deletions
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@ -42,7 +42,7 @@
 #define SPDLOG_DEPRECATED
 #endif

-#ifdef __linux__
+#if defined(__linux__) && !defined(__ANDROID__)
 #include <cxxabi.h>
 #define SPDLOG_CATCH_ALL catch (abi::__forced_unwind&) { _err_handler("Unknown exception"); throw; } catch (...)
 #else // __linux__