nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2791

Browse Source 
5b452248 fixed easylogging compile issue on OpenBSD (Dyrcona)
This commit is contained in:
Riccardo Spagni 2017-11-25 19:47:36 +02:00
commit d3785066d0
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
external/easylogging++/easylogging++.h vendored
View File

@ -99,6 +99,11 @@
#else #else
# define ELPP_OS_FREEBSD 0 # define ELPP_OS_FREEBSD 0
#endif #endif
#if (defined(__OpenBSD__))
# define ELPP_OS_OPENBSD 1
#else
# define ELPP_OS_OPENBSD 0
#endif
#if (defined(__sun)) #if (defined(__sun))
# define ELPP_OS_SOLARIS 1 # define ELPP_OS_SOLARIS 1
#else #else
@ -110,7 +115,7 @@
# define ELPP_OS_DRAGONFLY 0 # define ELPP_OS_DRAGONFLY 0
#endif #endif
// Unix // Unix
#if ((ELPP_OS_LINUX || ELPP_OS_MAC || ELPP_OS_FREEBSD || ELPP_OS_SOLARIS || ELPP_OS_DRAGONFLY) && (!ELPP_OS_WINDOWS)) #if ((ELPP_OS_LINUX || ELPP_OS_MAC || ELPP_OS_FREEBSD || ELPP_OS_SOLARIS || ELPP_OS_DRAGONFLY || ELPP_OS_OPENBSD) && (!ELPP_OS_WINDOWS))
# define ELPP_OS_UNIX 1 # define ELPP_OS_UNIX 1
#else #else
# define ELPP_OS_UNIX 0 # define ELPP_OS_UNIX 0
@ -195,7 +200,7 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
# define ELPP_INTERNAL_INFO(lvl, msg) # define ELPP_INTERNAL_INFO(lvl, msg)
#endif // (defined(ELPP_DEBUG_INFO)) #endif // (defined(ELPP_DEBUG_INFO))
#if (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG)) #if (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG))
# if (ELPP_COMPILER_GCC && !ELPP_MINGW) # if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD)
# define ELPP_STACKTRACE 1 # define ELPP_STACKTRACE 1
# else # else
# define ELPP_STACKTRACE 0 # define ELPP_STACKTRACE 0