summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-05-24 15:09:51 +0200
committerTycho <work.tycho+git@gmail.com>2014-05-24 15:09:51 +0200
commit944d29c0ae3929471a11ea11aa98441bc31f4d7d (patch)
treed2d083b4d40a7d30967d4b63ab1b67c1aba605c5 /tests
parentMoved accessors to cpp file (diff)
downloadcuberite-944d29c0ae3929471a11ea11aa98441bc31f4d7d.tar
cuberite-944d29c0ae3929471a11ea11aa98441bc31f4d7d.tar.gz
cuberite-944d29c0ae3929471a11ea11aa98441bc31f4d7d.tar.bz2
cuberite-944d29c0ae3929471a11ea11aa98441bc31f4d7d.tar.lz
cuberite-944d29c0ae3929471a11ea11aa98441bc31f4d7d.tar.xz
cuberite-944d29c0ae3929471a11ea11aa98441bc31f4d7d.tar.zst
cuberite-944d29c0ae3929471a11ea11aa98441bc31f4d7d.zip
Diffstat (limited to 'tests')
-rw-r--r--tests/ChunkData/CMakeLists.txt1
-rw-r--r--tests/TestGlobals.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/ChunkData/CMakeLists.txt b/tests/ChunkData/CMakeLists.txt
index 3f6653bb5..a2bd9fd22 100644
--- a/tests/ChunkData/CMakeLists.txt
+++ b/tests/ChunkData/CMakeLists.txt
@@ -4,6 +4,7 @@ enable_testing()
include_directories(${CMAKE_SOURCE_DIR}/src/)
+add_definitions(-DTEST_GLOBALS=1)
add_library(ChunkBuffer ${CMAKE_SOURCE_DIR}/src/ChunkData.cpp)
diff --git a/tests/TestGlobals.h b/tests/TestGlobals.h
index bb25bd20a..ea43de733 100644
--- a/tests/TestGlobals.h
+++ b/tests/TestGlobals.h
@@ -126,9 +126,9 @@ class cAssertFailure
#define UNUSED(X) (void)(X)
// Logging functions
-void LOGERROR(const char* a_Format, ...) FORMATSTRING(1,2);
+void inline LOGERROR(const char* a_Format, ...) FORMATSTRING(1,2);
-void LOGERROR(const char* a_Format, ...)
+void inline LOGERROR(const char* a_Format, ...)
{
va_list argList;
va_start(argList, a_Format);