Unverified Commit 6fd5f3c8 authored by Gabi Melman's avatar Gabi Melman Committed by GitHub

Merge pull request #545 from costinm/patch-1

Allow compilation on platforms with unwind (android)
parents 47c17be9 f4f3e3fb
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#define SPDLOG_DEPRECATED #define SPDLOG_DEPRECATED
#endif #endif
#ifdef __linux__ #if defined(__linux__) && !defined(__ANDROID__)
#include <cxxabi.h> #include <cxxabi.h>
#define SPDLOG_CATCH_ALL catch (abi::__forced_unwind&) { _err_handler("Unknown exception"); throw; } catch (...) #define SPDLOG_CATCH_ALL catch (abi::__forced_unwind&) { _err_handler("Unknown exception"); throw; } catch (...)
#else // __linux__ #else // __linux__
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment