From 23dd8d3559a10c5c2d3acb4c002ef26bb759c8bf Mon Sep 17 00:00:00 2001 From: Costin Manolache Date: Thu, 2 Nov 2017 17:12:08 -0700 Subject: [PATCH 1/2] Allow compilation on platforms with unwind (android) --- include/spdlog/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/spdlog/common.h b/include/spdlog/common.h index f6042d40..056e102a 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -42,7 +42,7 @@ #define SPDLOG_DEPRECATED #endif -#ifdef __linux__ +#if defined(__linux__) && !defined(SPDLOG_NO_UNWIND) #include #define SPDLOG_CATCH_ALL catch (abi::__forced_unwind&) { _err_handler("Unknown exception"); throw; } catch (...) #else // __linux__ From f4f3e3fb66180642a226cf0108eb1eebae50daa7 Mon Sep 17 00:00:00 2001 From: Costin Manolache Date: Fri, 3 Nov 2017 19:37:38 -0700 Subject: [PATCH 2/2] Use __ANDROID__ Based on review feedback. --- include/spdlog/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/spdlog/common.h b/include/spdlog/common.h index 056e102a..2310ed36 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -42,7 +42,7 @@ #define SPDLOG_DEPRECATED #endif -#if defined(__linux__) && !defined(SPDLOG_NO_UNWIND) +#if defined(__linux__) && !defined(__ANDROID__) #include #define SPDLOG_CATCH_ALL catch (abi::__forced_unwind&) { _err_handler("Unknown exception"); throw; } catch (...) #else // __linux__