diff options
| author | Martin Ridgers <[email protected]> | 2021-10-29 15:04:50 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-10-29 15:49:27 +0200 |
| commit | 4926ba7c4d7291e5d8f873e69f39e6e5840f48b0 (patch) | |
| tree | c9b3865d80dd17392e4ce513b1e4588ac41f6237 | |
| parent | GCC doesn't like whitespace after a \ in a raw string literal (diff) | |
| download | zen-4926ba7c4d7291e5d8f873e69f39e6e5840f48b0.tar.xz zen-4926ba7c4d7291e5d8f873e69f39e6e5840f48b0.zip | |
Fixed up Windows-specific include statements
| -rw-r--r-- | zenserver/cache/structuredcachestore.cpp | 5 | ||||
| -rw-r--r-- | zenserver/compute/apply.cpp | 2 | ||||
| -rw-r--r-- | zenserver/config.cpp | 7 | ||||
| -rw-r--r-- | zenserver/projectstore.cpp | 5 | ||||
| -rw-r--r-- | zenserver/testing/launch.cpp | 20 | ||||
| -rw-r--r-- | zenserver/zenserver.cpp | 5 |
6 files changed, 29 insertions, 15 deletions
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp index e7b840ed8..f8b42bcfd 100644 --- a/zenserver/cache/structuredcachestore.cpp +++ b/zenserver/cache/structuredcachestore.cpp @@ -3,7 +3,6 @@ #include "structuredcachestore.h" #include <zencore/except.h> -#include <zencore/windows.h> #include <zencore/compactbinary.h> #include <zencore/filesystem.h> @@ -16,6 +15,10 @@ #include <zenstore/cas.h> #include <zenstore/caslog.h> +#if ZEN_PLATFORM_WINDOWS +# include <zencore/windows.h> +#endif + #include <concepts> #include <filesystem> #include <unordered_map> diff --git a/zenserver/compute/apply.cpp b/zenserver/compute/apply.cpp index 053c262c2..b64a65f14 100644 --- a/zenserver/compute/apply.cpp +++ b/zenserver/compute/apply.cpp @@ -12,11 +12,11 @@ #include <zencore/iobuffer.h> #include <zencore/iohash.h> #include <zencore/scopeguard.h> -#include <zencore/windows.h> #include <zenstore/CAS.h> #include <zenstore/cidstore.h> #if ZEN_PLATFORM_WINDOWS +# include <zencore/windows.h> ZEN_THIRD_PARTY_INCLUDES_START # include <AccCtrl.h> # include <AclAPI.h> 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 diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index 9d74aa14e..83751dc3a 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -11,11 +11,14 @@ #include <zencore/stream.h> #include <zencore/string.h> #include <zencore/timer.h> -#include <zencore/windows.h> #include <zenstore/basicfile.h> #include <zenstore/cas.h> #include <zenstore/caslog.h> +#if ZEN_PLATFORM_WINDOWS +# include <zencore/windows.h> +#endif + #define USE_ROCKSDB 0 #if USE_ROCKSDB diff --git a/zenserver/testing/launch.cpp b/zenserver/testing/launch.cpp index 55695ac9c..1f38257e5 100644 --- a/zenserver/testing/launch.cpp +++ b/zenserver/testing/launch.cpp @@ -9,17 +9,21 @@ #include <zencore/iobuffer.h> #include <zencore/iohash.h> #include <zencore/logging.h> -#include <zencore/windows.h> #include <zenstore/CAS.h> -#include <AccCtrl.h> -#include <AclAPI.h> -#include <sddl.h> - -#include <UserEnv.h> -#pragma comment(lib, "UserEnv.lib") +#if ZEN_PLATFORM_WINDOWS +# include <zencore/windows.h> + +ZEN_THIRD_PARTY_INCLUDES_START +# include <AccCtrl.h> +# include <AclAPI.h> +# include <atlbase.h> +# include <sddl.h> +# include <UserEnv.h> +ZEN_THIRD_PARTY_INCLUDES_END +# pragma comment(lib, "UserEnv.lib") +#endif -#include <atlbase.h> #include <filesystem> #include <span> diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index d997cc8ff..bcc93b169 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -12,13 +12,16 @@ #include <zencore/string.h> #include <zencore/thread.h> #include <zencore/timer.h> -#include <zencore/windows.h> #include <zenhttp/httpserver.h> #include <zenstore/basicfile.h> #include <zenstore/cas.h> #include <zenstore/cidstore.h> #include <zenutil/zenserverprocess.h> +#if ZEN_PLATFORM_WINDOWS +# include <zencore/windows.h> +#endif + #if ZEN_USE_MIMALLOC ZEN_THIRD_PARTY_INCLUDES_START # include <mimalloc-new-delete.h> |