diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-03-04 18:44:13 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-03-04 18:46:18 +0100 |
| commit | b8db320bf14e327bcd12279871b914d8635ef122 (patch) | |
| tree | f9e1018ff8f1b4423264a4c11e087c296f36864b /src/tools | |
| parent | 61829e269e31d58161614e745a24c12972ec8e97 (diff) | |
Core/Misc: Prefix all preprocessor defines from CompilerDefs with TRINITY_ to avoid conflicts (PLATFORM_WINDOWS is used/defined by CascLib)
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/connection_patcher/Program.cpp | 4 | ||||
| -rw-r--r-- | src/tools/map_extractor/DB2.h | 3 | ||||
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 3 | ||||
| -rw-r--r-- | src/tools/map_extractor/loadlib/loadlib.h | 3 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/DB2.h | 3 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 3 |
6 files changed, 2 insertions, 17 deletions
diff --git a/src/tools/connection_patcher/Program.cpp b/src/tools/connection_patcher/Program.cpp index da78a76207a..949365b54ee 100644 --- a/src/tools/connection_patcher/Program.cpp +++ b/src/tools/connection_patcher/Program.cpp @@ -31,9 +31,9 @@ #include <boost/algorithm/string/replace.hpp> #include <boost/program_options.hpp> -#if PLATFORM == PLATFORM_WINDOWS +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS #include <Shlobj.h> -#elif PLATFORM == PLATFORM_UNIX +#elif TRINITY_PLATFORM == TRINITY_PLATFORM_UNIX #include <pwd.h> #endif 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 <boost/filesystem/operations.hpp> #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 <map> diff --git a/src/tools/vmap4_extractor/DB2.h b/src/tools/vmap4_extractor/DB2.h index 3d2574b8d4f..f28aeb0e05f 100644 --- a/src/tools/vmap4_extractor/DB2.h +++ b/src/tools/vmap4_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/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index 1541c71d14c..c76e0d948a8 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -38,9 +38,6 @@ #include <fstream> #include "Common.h" -#ifdef PLATFORM_WINDOWS -#undef PLATFORM_WINDOWS -#endif //From Extractor #include "adtfile.h" #include "wdtfile.h" |