diff options
| author | Mattes D <github@xoft.cz> | 2015-06-18 23:30:41 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-06-19 16:15:59 +0200 |
| commit | 8df31067d4703beb3225b7d9787385d58f893c5d (patch) | |
| tree | ab6863dece3d5741b8ea1989700f29188a4f8098 /src/Globals.h | |
| parent | PrefabPiecePool: Added loading from cubeset file. (diff) | |
| download | cuberite-8df31067d4703beb3225b7d9787385d58f893c5d.tar cuberite-8df31067d4703beb3225b7d9787385d58f893c5d.tar.gz cuberite-8df31067d4703beb3225b7d9787385d58f893c5d.tar.bz2 cuberite-8df31067d4703beb3225b7d9787385d58f893c5d.tar.lz cuberite-8df31067d4703beb3225b7d9787385d58f893c5d.tar.xz cuberite-8df31067d4703beb3225b7d9787385d58f893c5d.tar.zst cuberite-8df31067d4703beb3225b7d9787385d58f893c5d.zip | |
Diffstat (limited to 'src/Globals.h')
| -rw-r--r-- | src/Globals.h | 16 |
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 |