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/Common.h | |
| 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/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 9ccc0d4d149..a37111fcaf9 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> |