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/GitRevision.cpp | |
| 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/GitRevision.cpp')
| -rw-r--r-- | src/common/GitRevision.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/GitRevision.cpp b/src/common/GitRevision.cpp index 702cd01d84b..3e578cf1ee8 100644 --- a/src/common/GitRevision.cpp +++ b/src/common/GitRevision.cpp @@ -41,17 +41,17 @@ char const* GitRevision::GetFullDatabase() return _FULL_DATABASE; } -#if PLATFORM == PLATFORM_WINDOWS +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS # ifdef _WIN64 # define TRINITY_PLATFORM_STR "Win64" # else # define TRINITY_PLATFORM_STR "Win32" # endif -#elif PLATFORM == PLATFORM_APPLE +#elif TRINITY_PLATFORM == TRINITY_PLATFORM_APPLE # define TRINITY_PLATFORM_STR "MacOSX" -#elif PLATFORM == PLATFORM_INTEL +#elif TRINITY_PLATFORM == TRINITY_PLATFORM_INTEL # define TRINITY_PLATFORM_STR "Intel" -#else // PLATFORM_UNIX +#else // TRINITY_PLATFORM_UNIX # define TRINITY_PLATFORM_STR "Unix" #endif |