summaryrefslogtreecommitdiffstats
path: root/src/Globals.h
diff options
context:
space:
mode:
authorworktycho <work.tycho@gmail.com>2015-06-19 20:41:28 +0200
committerworktycho <work.tycho@gmail.com>2015-06-19 20:41:28 +0200
commit33d68572a61fa1c2201278b8bf4f77c73371930e (patch)
tree44a986bb7f90beee57a5bdc842c720fd657618bb /src/Globals.h
parentCheck the return value of InflateString (diff)
parentAdded cubeset file format docs. (diff)
downloadcuberite-33d68572a61fa1c2201278b8bf4f77c73371930e.tar
cuberite-33d68572a61fa1c2201278b8bf4f77c73371930e.tar.gz
cuberite-33d68572a61fa1c2201278b8bf4f77c73371930e.tar.bz2
cuberite-33d68572a61fa1c2201278b8bf4f77c73371930e.tar.lz
cuberite-33d68572a61fa1c2201278b8bf4f77c73371930e.tar.xz
cuberite-33d68572a61fa1c2201278b8bf4f77c73371930e.tar.zst
cuberite-33d68572a61fa1c2201278b8bf4f77c73371930e.zip
Diffstat (limited to '')
-rw-r--r--src/Globals.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/Globals.h b/src/Globals.h
index b787a94da..f0e370d2c 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -261,14 +261,15 @@ template class SizeChecker<UInt8, 1>;
+// Common headers (part 1, without macros):
+#include "StringUtils.h"
+#include "OSSupport/CriticalSection.h"
+#include "OSSupport/Event.h"
+#include "OSSupport/File.h"
+#include "OSSupport/StackTrace.h"
+
#ifndef TEST_GLOBALS
- // Common headers (part 1, without macros):
- #include "StringUtils.h"
- #include "OSSupport/CriticalSection.h"
- #include "OSSupport/Event.h"
- #include "OSSupport/File.h"
#include "Logger.h"
- #include "OSSupport/StackTrace.h"
#else
// Logging functions
void inline LOGERROR(const char * a_Format, ...) FORMATSTRING(1, 2);
@@ -315,6 +316,9 @@ void inline LOG(const char * a_Format, ...)
va_end(argList);
}
+#define LOGINFO LOG
+#define LOGWARN LOGWARNING
+
#endif