From b8db320bf14e327bcd12279871b914d8635ef122 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 4 Mar 2017 18:44:13 +0100 Subject: Core/Misc: Prefix all preprocessor defines from CompilerDefs with TRINITY_ to avoid conflicts (PLATFORM_WINDOWS is used/defined by CascLib) --- src/tools/map_extractor/DB2.h | 3 --- src/tools/map_extractor/System.cpp | 3 --- src/tools/map_extractor/loadlib/loadlib.h | 3 --- 3 files changed, 9 deletions(-) (limited to 'src/tools/map_extractor') diff --git a/src/tools/map_extractor/DB2.h b/src/tools/map_extractor/DB2.h index 3d2574b8d4f..f28aeb0e05f 100644 --- a/src/tools/map_extractor/DB2.h +++ b/src/tools/map_extractor/DB2.h @@ -19,9 +19,6 @@ #define MapExtractor_DB2_h__ #include "DB2Meta.h" -#ifdef PLATFORM_WINDOWS -#undef PLATFORM_WINDOWS -#endif #include "CascHandles.h" #include "CascLib.h" #include "Utilities/ByteConverter.h" diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index d313117b950..4b0dc6fb74f 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -29,9 +29,6 @@ #include #include "Common.h" -#ifdef PLATFORM_WINDOWS -#undef PLATFORM_WINDOWS -#endif #include "DBFilesClientList.h" #include "CascLib.h" #include "CascHandles.h" diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h index 216e8d2ab86..3267d944955 100644 --- a/src/tools/map_extractor/loadlib/loadlib.h +++ b/src/tools/map_extractor/loadlib/loadlib.h @@ -20,9 +20,6 @@ #define LOAD_LIB_H #include "Define.h" -#ifdef PLATFORM_WINDOWS -#undef PLATFORM_WINDOWS -#endif #include "CascHandles.h" #include "CascLib.h" #include -- cgit v1.2.3