TeaSpeak/spdlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #545 from costinm/patch-1

Browse Source 
Allow compilation on platforms with unwind (android)
This commit is contained in:
Gabi Melman 2017-11-04 10:24:43 +02:00 committed by GitHub
commit 6fd5f3c866
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdlog/common.h
View File

@ -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__