diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-05-23 18:34:02 +0200 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2017-05-23 18:46:44 +0200 |
| commit | 9ec2a82cac993648ed603711f84b6b743ca1e106 (patch) | |
| tree | 350b58c26e075f52d778adb757f2f539f23b95cb /src/common/Debugging | |
| parent | 04dfd78dac85f18b3a6d389f2b9f65ab0a534dff (diff) | |
Core/Misc: Prefix all preprocessor defines from CompilerDefs with TRINITY_ to avoid conflicts (PLATFORM_WINDOWS is used/defined by CascLib)
(cherry picked from commit b8db320bf14e327bcd12279871b914d8635ef122)
Diffstat (limited to 'src/common/Debugging')
| -rw-r--r-- | src/common/Debugging/Errors.h | 2 | ||||
| -rw-r--r-- | src/common/Debugging/WheatyExceptionReport.cpp | 2 | ||||
| -rw-r--r-- | src/common/Debugging/WheatyExceptionReport.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/common/Debugging/Errors.h b/src/common/Debugging/Errors.h index bf06d77d303..c21972af906 100644 --- a/src/common/Debugging/Errors.h +++ b/src/common/Debugging/Errors.h @@ -38,7 +38,7 @@ namespace Trinity } // namespace Trinity -#if COMPILER == COMPILER_MICROSOFT +#if TRINITY_COMPILER == TRINITY_COMPILER_MICROSOFT #define ASSERT_BEGIN __pragma(warning(push)) __pragma(warning(disable: 4127)) #define ASSERT_END __pragma(warning(pop)) #else diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index 09a027d167b..5585dd25c13 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) diff --git a/src/common/Debugging/WheatyExceptionReport.h b/src/common/Debugging/WheatyExceptionReport.h index aec52b165f1..91c2ae93179 100644 --- a/src/common/Debugging/WheatyExceptionReport.h +++ b/src/common/Debugging/WheatyExceptionReport.h @@ -1,7 +1,7 @@ #ifndef _WHEATYEXCEPTIONREPORT_ #define _WHEATYEXCEPTIONREPORT_ -#if PLATFORM == PLATFORM_WINDOWS && !defined(__MINGW32__) +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS && !defined(__MINGW32__) #include <winnt.h> #include <winternl.h> |