From 9187bcf62b48e52ae66a2fef772c21900aa4ddb6 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 19 Dec 2019 23:42:43 -0600 Subject: [PATCH] [ox/std] Fix __has_include logic --- deps/ox/src/ox/std/stacktrace.cpp | 4 ++-- deps/ox/src/ox/std/trace.cpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/deps/ox/src/ox/std/stacktrace.cpp b/deps/ox/src/ox/std/stacktrace.cpp index 3eeffada..f22869a4 100644 --- a/deps/ox/src/ox/std/stacktrace.cpp +++ b/deps/ox/src/ox/std/stacktrace.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#if defined(OX_USE_STDLIB) +#if defined(OX_USE_STDLIB) && __has_include() #include #include #include @@ -18,7 +18,7 @@ namespace ox { void printStackTrace([[maybe_unused]]int shave) { -#if defined(OX_USE_STDLIB) +#if defined(OX_USE_STDLIB) && __has_include() std::array frames; auto size = static_cast(backtrace(frames.data(), frames.size())); if (size > shave) { diff --git a/deps/ox/src/ox/std/trace.cpp b/deps/ox/src/ox/std/trace.cpp index 373328ff..8934cc56 100644 --- a/deps/ox/src/ox/std/trace.cpp +++ b/deps/ox/src/ox/std/trace.cpp @@ -15,8 +15,6 @@ #include "trace.hpp" -int counter = 0; - extern "C" void oxTraceHook([[maybe_unused]] const char *file, [[maybe_unused]] int line, [[maybe_unused]] const char *ch, [[maybe_unused]] const char *msg) {