aboutsummaryrefslogtreecommitdiff
path: root/zenserver/compute/apply.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-10-15 16:29:38 +0200
committerStefan Boberg <[email protected]>2021-10-15 16:29:38 +0200
commitbb258b7bf62c5021d2ccde38107efcfdfc52ddd0 (patch)
tree6d641ac4ecc04373e19a9c80776a47ba5b590eaf /zenserver/compute/apply.cpp
parentzencore: added ZEN_THIRD_PARTY_INCLUDES_START/ZEN_THIRD_PARTY_INCLUDES_END (diff)
downloadzen-bb258b7bf62c5021d2ccde38107efcfdfc52ddd0.tar.xz
zen-bb258b7bf62c5021d2ccde38107efcfdfc52ddd0.zip
zencore: Enabled MSC warning 4668 to get warnings when preprocessor macros are used without an explicit definition
Also fixed up various code to compile with this, by using ZEN_THIRD_PARTY_INCLUDES_START/ZEN_THIRD_PARTY_INCLUDES_END macros Removed prewindows.h/postwindows.h since they are no longer to be used due to the above
Diffstat (limited to 'zenserver/compute/apply.cpp')
-rw-r--r--zenserver/compute/apply.cpp6
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>