summaryrefslogtreecommitdiffstats
path: root/src/Root.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2016-11-19 18:17:35 +0100
committerGitHub <noreply@github.com>2016-11-19 18:17:35 +0100
commit4ff997398773de36799b128bd4987cd36751f0c5 (patch)
tree2e102088f7f8c1bb4b398de9043cf36c4e42767a /src/Root.cpp
parentUpdated the Core. (diff)
parentRemoved ClientHandle.h dependencies from common headers. (diff)
downloadcuberite-4ff997398773de36799b128bd4987cd36751f0c5.tar
cuberite-4ff997398773de36799b128bd4987cd36751f0c5.tar.gz
cuberite-4ff997398773de36799b128bd4987cd36751f0c5.tar.bz2
cuberite-4ff997398773de36799b128bd4987cd36751f0c5.tar.lz
cuberite-4ff997398773de36799b128bd4987cd36751f0c5.tar.xz
cuberite-4ff997398773de36799b128bd4987cd36751f0c5.tar.zst
cuberite-4ff997398773de36799b128bd4987cd36751f0c5.zip
Diffstat (limited to 'src/Root.cpp')
-rw-r--r--src/Root.cpp30
1 files changed, 17 insertions, 13 deletions
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 <iostream>
+
+// OS-specific headers:
+#if defined(_WIN32)
+ #include <psapi.h>
+#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
+ #include <signal.h>
+ #if defined(__linux__)
+ #include <fstream>
+ #elif defined(__APPLE__)
+ #include <mach/mach.h>
+ #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 <iostream>
-
-#if defined(_WIN32)
- #include <psapi.h>
-#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
- #include <signal.h>
- #if defined(__linux__)
- #include <fstream>
- #elif defined(__APPLE__)
- #include <mach/mach.h>
- #endif
-#endif
+#include "ClientHandle.h"