diff options
| author | Martin Ridgers <[email protected]> | 2021-10-16 10:53:54 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-10-16 10:53:54 +0200 |
| commit | 8030078d08379d011781c8c09d6840fc24aaec23 (patch) | |
| tree | 15c5f9b4032140211f34713a034e36ce4b697f78 /zenserver/compute/apply.cpp | |
| parent | Merged main (diff) | |
| parent | Fixed up some more windows include issues (diff) | |
| download | zen-8030078d08379d011781c8c09d6840fc24aaec23.tar.xz zen-8030078d08379d011781c8c09d6840fc24aaec23.zip | |
Merged main
Diffstat (limited to 'zenserver/compute/apply.cpp')
| -rw-r--r-- | zenserver/compute/apply.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/zenserver/compute/apply.cpp b/zenserver/compute/apply.cpp index a522aa35b..053c262c2 100644 --- a/zenserver/compute/apply.cpp +++ b/zenserver/compute/apply.cpp @@ -16,18 +16,16 @@ #include <zenstore/CAS.h> #include <zenstore/cidstore.h> -// clang-format off #if ZEN_PLATFORM_WINDOWS -# include <zencore/prewindows.h> +ZEN_THIRD_PARTY_INCLUDES_START # include <AccCtrl.h> # include <AclAPI.h> # include <sddl.h> # include <UserEnv.h> # pragma comment(lib, "UserEnv.lib") # include <atlbase.h> -# include <zencore/postwindows.h> +ZEN_THIRD_PARTY_INCLUDES_END #endif -// clang-format on #include <filesystem> #include <span> |