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/common/Debugging/WheatyExceptionReport.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/common/Debugging/WheatyExceptionReport.cpp')
-rw-r--r-- | src/common/Debugging/WheatyExceptionReport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index 68226d9c3a6..25d768654f6 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -5,7 +5,7 @@ //========================================== #include "CompilerDefs.h" -#if PLATFORM == PLATFORM_WINDOWS && !defined(__MINGW32__) +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS && !defined(__MINGW32__) #define WIN32_LEAN_AND_MEAN #pragma warning(disable:4996) #pragma warning(disable:4312) |