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/Define.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/Define.h')
| -rw-r--r-- | src/common/Define.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/common/Define.h b/src/common/Define.h index 6e3499a46c9..e34ee8bfa18 100644 --- a/src/common/Define.h +++ b/src/common/Define.h @@ -21,7 +21,7 @@ #include "CompilerDefs.h" -#if COMPILER == COMPILER_GNU +#if TRINITY_COMPILER == TRINITY_COMPILER_GNU # if !defined(__STDC_FORMAT_MACROS) # define __STDC_FORMAT_MACROS # endif @@ -55,7 +55,7 @@ # endif #endif -#if PLATFORM == PLATFORM_WINDOWS +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS # define TRINITY_PATH_MAX MAX_PATH # define _USE_MATH_DEFINES # ifndef DECLSPEC_NORETURN @@ -64,11 +64,11 @@ # ifndef DECLSPEC_DEPRECATED # define DECLSPEC_DEPRECATED __declspec(deprecated) # endif //DECLSPEC_DEPRECATED -#else //PLATFORM != PLATFORM_WINDOWS +#else // TRINITY_PLATFORM != TRINITY_PLATFORM_WINDOWS # define TRINITY_PATH_MAX PATH_MAX # define DECLSPEC_NORETURN # define DECLSPEC_DEPRECATED -#endif //PLATFORM +#endif // TRINITY_PLATFORM #if !defined(COREDEBUG) # define TRINITY_INLINE inline @@ -79,21 +79,21 @@ # define TRINITY_INLINE #endif //!COREDEBUG -#if COMPILER == COMPILER_GNU +#if TRINITY_COMPILER == TRINITY_COMPILER_GNU # define ATTR_NORETURN __attribute__((__noreturn__)) # define ATTR_PRINTF(F, V) __attribute__ ((__format__ (__printf__, F, V))) # define ATTR_DEPRECATED __attribute__((__deprecated__)) -#else //COMPILER != COMPILER_GNU +#else //TRINITY_COMPILER != TRINITY_COMPILER_GNU # define ATTR_NORETURN # define ATTR_PRINTF(F, V) # define ATTR_DEPRECATED -#endif //COMPILER == COMPILER_GNU +#endif //TRINITY_COMPILER == TRINITY_COMPILER_GNU #ifdef TRINITY_API_USE_DYNAMIC_LINKING -# if COMPILER == COMPILER_MICROSOFT +# if TRINITY_COMPILER == TRINITY_COMPILER_MICROSOFT # define TC_API_EXPORT __declspec(dllexport) # define TC_API_IMPORT __declspec(dllimport) -# elif COMPILER == COMPILER_GNU +# elif TRINITY_COMPILER == TRINITY_COMPILER_GNU # define TC_API_EXPORT __attribute__((visibility("default"))) # define TC_API_IMPORT # else |