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/Common.h | |
| 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/Common.h')
| -rw-r--r-- | src/common/Common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/Common.h b/src/common/Common.h index 5e3550fdeae..1097249bcab 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -53,14 +53,14 @@ #include "Threading/LockedQueue.h" -#if PLATFORM == PLATFORM_WINDOWS +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS # include <ws2tcpip.h> -# if defined(__INTEL_COMPILER) +# if TRINITY_COMPILER == TRINITY_COMPILER_INTEL # if !defined(BOOST_ASIO_HAS_MOVE) # define BOOST_ASIO_HAS_MOVE # endif // !defined(BOOST_ASIO_HAS_MOVE) -# endif // if defined(__INTEL_COMPILER) +# endif // if TRINITY_COMPILER == TRINITY_COMPILER_INTEL #else # include <sys/types.h> @@ -71,7 +71,7 @@ # include <netdb.h> #endif -#if COMPILER == COMPILER_MICROSOFT +#if TRINITY_COMPILER == TRINITY_COMPILER_MICROSOFT #include <float.h> |