aboutsummaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorDyrcona <jason@sigio.com>2017-11-11 14:42:59 +0100
committerston1th <ston1th@giftfish.de>2017-11-12 00:56:07 +0100
commit5b452248a84c53ffb34c54aa8d349a6f93492a9a (patch)
tree1de9b7e6a341027b85288cdd81541a4e7aced7e3 /external
parentMerge pull request #2764 (diff)
downloadmonero-5b452248a84c53ffb34c54aa8d349a6f93492a9a.tar.xz
fixed easylogging compile issue on OpenBSD
Issue: #2575 Add ELPP_OS_OPENBSD macros to easylogging++.h so that it will build on OpenBSD.
Diffstat (limited to 'external')
-rw-r--r--external/easylogging++/easylogging++.h9
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