Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #873

Browse Source 
d718960 remove POSIX_C_SOURCE and remove dlfcn.h for static builds (luigi1111)
This commit is contained in:
Riccardo Spagni 2016-07-06 18:12:03 +02:00
commit 628f57b212
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -323,7 +323,7 @@ else()
endif() endif()
if(MINGW) if(MINGW)
set(WARNINGS "${WARNINGS} -Wno-error=unused-value -Wno-error=unused-but-set-variable") 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) set(Boost_THREADAPI win32)
include_directories(SYSTEM src/platform/mingw) include_directories(SYSTEM src/platform/mingw)
# mingw doesn't support LTO (multiple definition errors at link time) # mingw doesn't support LTO (multiple definition errors at link time)

2
src/common/stack_trace.cpp
View File

@ -33,7 +33,9 @@
#include <libunwind.h> #include <libunwind.h>
#endif #endif
#include <cxxabi.h> #include <cxxabi.h>
#ifndef STATICLIB
#include <dlfcn.h> #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 // from http://stackoverflow.com/questions/11665829/how-can-i-print-stack-trace-for-caught-exceptions-in-c-code-injection-in-c
#ifdef STATICLIB #ifdef STATICLIB