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/connection_patcher/Program.cpp | |
| 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/connection_patcher/Program.cpp')
| -rw-r--r-- | src/tools/connection_patcher/Program.cpp | 4 |
1 files changed, 2 insertions, 2 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 |