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/CompilerDefs.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/CompilerDefs.h')
| -rw-r--r-- | src/common/CompilerDefs.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/common/CompilerDefs.h b/src/common/CompilerDefs.h index 10db0589539..0509dcf9177 100644 --- a/src/common/CompilerDefs.h +++ b/src/common/CompilerDefs.h @@ -19,37 +19,37 @@ #ifndef TRINITY_COMPILERDEFS_H #define TRINITY_COMPILERDEFS_H -#define PLATFORM_WINDOWS 0 -#define PLATFORM_UNIX 1 -#define PLATFORM_APPLE 2 -#define PLATFORM_INTEL 3 +#define TRINITY_PLATFORM_WINDOWS 0 +#define TRINITY_PLATFORM_UNIX 1 +#define TRINITY_PLATFORM_APPLE 2 +#define TRINITY_PLATFORM_INTEL 3 // must be first (win 64 also define _WIN32) #if defined( _WIN64 ) -# define PLATFORM PLATFORM_WINDOWS +# define TRINITY_PLATFORM TRINITY_PLATFORM_WINDOWS #elif defined( __WIN32__ ) || defined( WIN32 ) || defined( _WIN32 ) -# define PLATFORM PLATFORM_WINDOWS +# define TRINITY_PLATFORM TRINITY_PLATFORM_WINDOWS #elif defined( __APPLE_CC__ ) -# define PLATFORM PLATFORM_APPLE +# define TRINITY_PLATFORM TRINITY_PLATFORM_APPLE #elif defined( __INTEL_COMPILER ) -# define PLATFORM PLATFORM_INTEL +# define TRINITY_PLATFORM TRINITY_PLATFORM_INTEL #else -# define PLATFORM PLATFORM_UNIX +# define TRINITY_PLATFORM TRINITY_PLATFORM_UNIX #endif -#define COMPILER_MICROSOFT 0 -#define COMPILER_GNU 1 -#define COMPILER_BORLAND 2 -#define COMPILER_INTEL 3 +#define TRINITY_COMPILER_MICROSOFT 0 +#define TRINITY_COMPILER_GNU 1 +#define TRINITY_COMPILER_BORLAND 2 +#define TRINITY_COMPILER_INTEL 3 #ifdef _MSC_VER -# define COMPILER COMPILER_MICROSOFT +# define TRINITY_COMPILER TRINITY_COMPILER_MICROSOFT #elif defined( __BORLANDC__ ) -# define COMPILER COMPILER_BORLAND +# define TRINITY_COMPILER TRINITY_COMPILER_BORLAND #elif defined( __INTEL_COMPILER ) -# define COMPILER COMPILER_INTEL +# define TRINITY_COMPILER TRINITY_COMPILER_INTEL #elif defined( __GNUC__ ) -# define COMPILER COMPILER_GNU +# define TRINITY_COMPILER TRINITY_COMPILER_GNU # define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #else # error "FATAL ERROR: Unknown compiler." |