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/Logging/Log.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/Logging/Log.h')
| -rw-r--r-- | src/common/Logging/Log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h index a4e0cb6a5dc..218d03f804d 100644 --- a/src/common/Logging/Log.h +++ b/src/common/Logging/Log.h @@ -166,7 +166,7 @@ inline bool Log::ShouldLog(std::string const& type, LogLevel level) const } \ } -#if PLATFORM != PLATFORM_WINDOWS +#if TRINITY_PLATFORM != TRINITY_PLATFORM_WINDOWS void check_args(const char*, ...) ATTR_PRINTF(1, 2); void check_args(std::string const&, ...); |