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 | |
| 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')
| -rw-r--r-- | src/common/Logging/AppenderConsole.cpp | 6 | ||||
| -rw-r--r-- | src/common/Logging/AppenderFile.cpp | 2 | ||||
| -rw-r--r-- | src/common/Logging/Log.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/common/Logging/AppenderConsole.cpp b/src/common/Logging/AppenderConsole.cpp index e61cfdf30fa..3378c185cc5 100644 --- a/src/common/Logging/AppenderConsole.cpp +++ b/src/common/Logging/AppenderConsole.cpp @@ -21,7 +21,7 @@ #include "Config.h" #include "Util.h" -#if PLATFORM == PLATFORM_WINDOWS +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS #include <Windows.h> #endif @@ -66,7 +66,7 @@ void AppenderConsole::InitColors(std::string const& str) void AppenderConsole::SetColor(bool stdout_stream, ColorTypes color) { -#if PLATFORM == PLATFORM_WINDOWS +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS static WORD WinColorFG[MaxColors] = { 0, // BLACK @@ -153,7 +153,7 @@ void AppenderConsole::SetColor(bool stdout_stream, ColorTypes color) void AppenderConsole::ResetColor(bool stdout_stream) { - #if PLATFORM == PLATFORM_WINDOWS + #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS HANDLE hConsole = GetStdHandle(stdout_stream ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE); SetConsoleTextAttribute(hConsole, FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED); #else diff --git a/src/common/Logging/AppenderFile.cpp b/src/common/Logging/AppenderFile.cpp index cfd8732bd5c..a1595594a36 100644 --- a/src/common/Logging/AppenderFile.cpp +++ b/src/common/Logging/AppenderFile.cpp @@ -20,7 +20,7 @@ #include "StringFormat.h" #include "Log.h" -#if PLATFORM == PLATFORM_WINDOWS +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS # include <Windows.h> #endif 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&, ...); |