From 0bffa2935854d1b1d0110a33707650cafe084af7 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Fri, 18 Nov 2016 20:00:04 +0100 Subject: Removed ClientHandle.h dependencies from common headers. --- src/Root.cpp | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'src/Root.cpp') diff --git a/src/Root.cpp b/src/Root.cpp index 27277512c..55e149511 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -2,6 +2,22 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Root.h" + +// STD lib hreaders: +#include + +// OS-specific headers: +#if defined(_WIN32) + #include +#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) + #include + #if defined(__linux__) + #include + #elif defined(__APPLE__) + #include + #endif +#endif + #include "Server.h" #include "World.h" #include "WebAdmin.h" @@ -23,19 +39,7 @@ #include "SettingsRepositoryInterface.h" #include "OverridesSettingsRepository.h" #include "Logger.h" - -#include - -#if defined(_WIN32) - #include -#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) - #include - #if defined(__linux__) - #include - #elif defined(__APPLE__) - #include - #endif -#endif +#include "ClientHandle.h" -- cgit v1.2.3