diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-07-06 18:12:03 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-07-06 18:12:03 +0200 |
| commit | 628f57b2120085338fa259896c80b1de4621f8dc (patch) | |
| tree | 7fb0360e5c7386c8b271b2b6eb0f309d69f61053 | |
| parent | Merge pull request #872 (diff) | |
| parent | remove POSIX_C_SOURCE and remove dlfcn.h for static builds (diff) | |
| download | monero-628f57b2120085338fa259896c80b1de4621f8dc.tar.xz | |
Merge pull request #873
d718960 remove POSIX_C_SOURCE and remove dlfcn.h for static builds (luigi1111)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/stack_trace.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 084c087d8..1e7806fa1 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 <libunwind.h> #endif #include <cxxabi.h> +#ifndef STATICLIB #include <dlfcn.h> +#endif // from http://stackoverflow.com/questions/11665829/how-can-i-print-stack-trace-for-caught-exceptions-in-c-code-injection-in-c #ifdef STATICLIB |