aboutsummaryrefslogtreecommitdiff
path: root/zenserver/config.cpp
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-10-29 15:04:50 +0200
committerMartin Ridgers <[email protected]>2021-10-29 15:49:27 +0200
commit4926ba7c4d7291e5d8f873e69f39e6e5840f48b0 (patch)
treec9b3865d80dd17392e4ce513b1e4588ac41f6237 /zenserver/config.cpp
parentGCC doesn't like whitespace after a \ in a raw string literal (diff)
downloadzen-4926ba7c4d7291e5d8f873e69f39e6e5840f48b0.tar.xz
zen-4926ba7c4d7291e5d8f873e69f39e6e5840f48b0.zip
Fixed up Windows-specific include statements
Diffstat (limited to 'zenserver/config.cpp')
-rw-r--r--zenserver/config.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/zenserver/config.cpp b/zenserver/config.cpp
index 67af37678..f761c6a8d 100644
--- a/zenserver/config.cpp
+++ b/zenserver/config.cpp
@@ -11,13 +11,14 @@
ZEN_THIRD_PARTY_INCLUDES_START
#include <cxxopts.hpp>
-ZEN_THIRD_PARTY_INCLUDES_END
-
#include <fmt/format.h>
#include <zencore/logging.h>
#include <sol/sol.hpp>
+ZEN_THIRD_PARTY_INCLUDES_END
-#include <conio.h>
+#if ZEN_PLATFORM_WINDOWS
+# include <conio.h>
+#endif
#if ZEN_PLATFORM_WINDOWS