diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-20 03:06:03 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-20 03:06:03 +0200 |
| commit | e68d3b0937e205c94c17d7cb1a53194b6d169fe8 (patch) | |
| tree | 326d69976375006fe244df6e858bd20e83fcae90 /src/server/shared/Logging/AppenderConsole.cpp | |
| parent | abe8dd7abf70b3589ad0cbba19f91bd4f743bf3e (diff) | |
| parent | 0531f52008cfc4ecb28c0b3cd67504e06452ab75 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
Diffstat (limited to 'src/server/shared/Logging/AppenderConsole.cpp')
| -rw-r--r-- | src/server/shared/Logging/AppenderConsole.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/shared/Logging/AppenderConsole.cpp b/src/server/shared/Logging/AppenderConsole.cpp index 8102d3b6021..20923162906 100644 --- a/src/server/shared/Logging/AppenderConsole.cpp +++ b/src/server/shared/Logging/AppenderConsole.cpp @@ -16,14 +16,14 @@ */ #include <sstream> -#if PLATFORM == PLATFORM_WINDOWS - #include <windows.h> -#endif #include "AppenderConsole.h" #include "Config.h" #include "Util.h" +#if PLATFORM == PLATFORM_WINDOWS + #include <Windows.h> +#endif AppenderConsole::AppenderConsole(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags): Appender(id, name, APPENDER_CONSOLE, level, flags), _colored(false) |