diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-25 19:47:36 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-25 19:47:36 +0200 |
| commit | d3785066d0544dfab9af2f5d9f4ebdda9dba92a8 (patch) | |
| tree | a961c847380586b4962e2bcc5352b6432846c21e /external | |
| parent | Merge pull request #2788 (diff) | |
| parent | fixed easylogging compile issue on OpenBSD (diff) | |
| download | monero-d3785066d0544dfab9af2f5d9f4ebdda9dba92a8.tar.xz | |
Merge pull request #2791
5b452248 fixed easylogging compile issue on OpenBSD (Dyrcona)
Diffstat (limited to 'external')
| -rw-r--r-- | external/easylogging++/easylogging++.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index c55cce755..469cf9eec 100644 --- a/external/easylogging++/easylogging++.h +++ b/external/easylogging++/easylogging++.h @@ -99,6 +99,11 @@ #else # define ELPP_OS_FREEBSD 0 #endif +#if (defined(__OpenBSD__)) +# define ELPP_OS_OPENBSD 1 +#else +# define ELPP_OS_OPENBSD 0 +#endif #if (defined(__sun)) # define ELPP_OS_SOLARIS 1 #else @@ -110,7 +115,7 @@ # define ELPP_OS_DRAGONFLY 0 #endif // 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 #else # 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) #endif // (defined(ELPP_DEBUG_INFO)) #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 # else # define ELPP_STACKTRACE 0 |