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/Logging/AppenderConsole.cpp | |
| 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/Logging/AppenderConsole.cpp')
| -rw-r--r-- | src/common/Logging/AppenderConsole.cpp | 6 |
1 files changed, 3 insertions, 3 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 |