summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Hanninen <matti@mjhanninen.com>2015-08-23 08:13:53 +0200
committerMatti Hänninen <matti@mjhanninen.com>2015-08-27 07:15:08 +0200
commitc3d84a24a9ae426a57301c1585468b6ea35bbaeb (patch)
treec20d46199ec725e62ec1705756ae427640e29e92
parentMerge pull request #2446 from cuberite/asyncpathfinder (diff)
downloadcuberite-c3d84a24a9ae426a57301c1585468b6ea35bbaeb.tar
cuberite-c3d84a24a9ae426a57301c1585468b6ea35bbaeb.tar.gz
cuberite-c3d84a24a9ae426a57301c1585468b6ea35bbaeb.tar.bz2
cuberite-c3d84a24a9ae426a57301c1585468b6ea35bbaeb.tar.lz
cuberite-c3d84a24a9ae426a57301c1585468b6ea35bbaeb.tar.xz
cuberite-c3d84a24a9ae426a57301c1585468b6ea35bbaeb.tar.zst
cuberite-c3d84a24a9ae426a57301c1585468b6ea35bbaeb.zip
Diffstat (limited to '')
-rw-r--r--src/Root.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Root.cpp b/src/Root.cpp
index ba895a9d6..dc90671fb 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -25,13 +25,15 @@
#include <iostream>
-#ifdef _WIN32
+#if defined(_WIN32)
#include <psapi.h>
-#elif defined(__linux__)
- #include <fstream>
+#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#include <signal.h>
-#elif defined(__APPLE__)
- #include <mach/mach.h>
+ #if defined(__linux__)
+ #include <fstream>
+ #elif defined(__APPLE__)
+ #include <mach/mach.h>
+ #endif
#endif