drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[ox/std] Fix __has_include logic

Browse Source
This commit is contained in:
Gary Talent 2019-12-19 23:42:43 -06:00
parent 8c576ef9c5
commit 9187bcf62b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/src/ox/std/stacktrace.cpp vendored
View File

@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#if defined(OX_USE_STDLIB) #if defined(OX_USE_STDLIB) && __has_include(<unistd.h>)
#include <array> #include <array>
#include <execinfo.h> #include <execinfo.h>
#include <iostream> #include <iostream>
@ -18,7 +18,7 @@
namespace ox { namespace ox {
void printStackTrace([[maybe_unused]]int shave) { void printStackTrace([[maybe_unused]]int shave) {
#if defined(OX_USE_STDLIB) #if defined(OX_USE_STDLIB) && __has_include(<unistd.h>)
std::array<void*, 100> frames; std::array<void*, 100> frames;
auto size = static_cast<int>(backtrace(frames.data(), frames.size())); auto size = static_cast<int>(backtrace(frames.data(), frames.size()));
if (size > shave) { if (size > shave) {

2
deps/ox/src/ox/std/trace.cpp vendored
View File

@ -15,8 +15,6 @@
#include "trace.hpp" #include "trace.hpp"
int counter = 0;
extern "C" extern "C"
void oxTraceHook([[maybe_unused]] const char *file, [[maybe_unused]] int line, void oxTraceHook([[maybe_unused]] const char *file, [[maybe_unused]] int line,
[[maybe_unused]] const char *ch, [[maybe_unused]] const char *msg) { [[maybe_unused]] const char *ch, [[maybe_unused]] const char *msg) {