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/GitRevision.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/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 1f4c28cd310..e0626a7df1d 100644 --- a/src/common/GitRevision.cpp +++ b/src/common/GitRevision.cpp @@ -46,17 +46,17 @@ char const* GitRevision::GetHotfixesDatabase() return _HOTFIXES_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 |