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 /zenserver/testing/launch.cpp | |
| 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
Diffstat (limited to 'zenserver/testing/launch.cpp')
| -rw-r--r-- | zenserver/testing/launch.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
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> |