summaryrefslogtreecommitdiffstats
path: root/src/Globals.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-09-16 09:12:56 +0200
committerMattes D <github@xoft.cz>2015-09-16 09:12:56 +0200
commitd041057da239d6dca02306849bd62973f3a51c62 (patch)
tree82d3aaa2905d360779ea472bc3baf91f8539758b /src/Globals.h
parentMerge pull request #2473 from cuberite/APIDumpRename (diff)
parentIncrease robustness of the logging subsystem (diff)
downloadcuberite-d041057da239d6dca02306849bd62973f3a51c62.tar
cuberite-d041057da239d6dca02306849bd62973f3a51c62.tar.gz
cuberite-d041057da239d6dca02306849bd62973f3a51c62.tar.bz2
cuberite-d041057da239d6dca02306849bd62973f3a51c62.tar.lz
cuberite-d041057da239d6dca02306849bd62973f3a51c62.tar.xz
cuberite-d041057da239d6dca02306849bd62973f3a51c62.tar.zst
cuberite-d041057da239d6dca02306849bd62973f3a51c62.zip
Diffstat (limited to 'src/Globals.h')
-rw-r--r--src/Globals.h20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/Globals.h b/src/Globals.h
index 1afcc928c..a69a64452 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -271,7 +271,25 @@ template class SizeChecker<UInt8, 1>;
#include "OSSupport/StackTrace.h"
#ifndef TEST_GLOBALS
- #include "Logger.h"
+
+// These fiunctions are defined in Logger.cpp, but are declared here to avoid including all of logger.h
+extern void LOG (const char * a_Format, ...) FORMATSTRING(1, 2);
+extern void LOGINFO (const char * a_Format, ...) FORMATSTRING(1, 2);
+extern void LOGWARNING(const char * a_Format, ...) FORMATSTRING(1, 2);
+extern void LOGERROR (const char * a_Format, ...) FORMATSTRING(1, 2);
+
+
+
+
+
+// In debug builds, translate LOGD to LOG, otherwise leave it out altogether:
+#ifdef _DEBUG
+ #define LOGD LOG
+#else
+ #define LOGD(...)
+#endif // _DEBUG
+
+#define LOGWARN LOGWARNING
#else
// Logging functions
void inline LOGERROR(const char * a_Format, ...) FORMATSTRING(1, 2);