From d7189600aed51e5fde7e9fa01c3b632e6d251de4 Mon Sep 17 00:00:00 2001 From: luigi1111 Date: Tue, 21 Jun 2016 11:16:25 -0500 Subject: [PATCH] remove POSIX_C_SOURCE and remove dlfcn.h for static builds The former was a faulty "fix" for gmtime_r not existing on Windows. The latter is needed only for dynamic builds, and is not included with msys2, which ends up fine because Windows is only built static at this time. --- CMakeLists.txt | 2 +- src/common/stack_trace.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e99e5a51..2703a2c23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -323,7 +323,7 @@ else() endif() if(MINGW) set(WARNINGS "${WARNINGS} -Wno-error=unused-value -Wno-error=unused-but-set-variable") - set(MINGW_FLAG "${MINGW_FLAG} -DWIN32_LEAN_AND_MEAN -D_POSIX_C_SOURCE") + set(MINGW_FLAG "${MINGW_FLAG} -DWIN32_LEAN_AND_MEAN") set(Boost_THREADAPI win32) include_directories(SYSTEM src/platform/mingw) # mingw doesn't support LTO (multiple definition errors at link time) diff --git a/src/common/stack_trace.cpp b/src/common/stack_trace.cpp index 2805e7604..0d2ccb39d 100644 --- a/src/common/stack_trace.cpp +++ b/src/common/stack_trace.cpp @@ -33,7 +33,9 @@ #include #endif #include +#ifndef STATICLIB #include +#endif // from http://stackoverflow.com/questions/11665829/how-can-i-print-stack-trace-for-caught-exceptions-in-c-code-injection-in-c #ifdef STATICLIB