From bb258b7bf62c5021d2ccde38107efcfdfc52ddd0 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Fri, 15 Oct 2021 16:29:38 +0200
Subject: 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
---
 zenserver/zenserver.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'zenserver/zenserver.cpp')

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index a1cd01d33..c9b52604d 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -16,17 +16,21 @@
 #include <zenstore/cidstore.h>
 #include <zenutil/zenserverprocess.h>
 
-#include <fmt/format.h>
-
 #if ZEN_USE_MIMALLOC
+ZEN_THIRD_PARTY_INCLUDES_START
 #	include <mimalloc-new-delete.h>
 #	include <mimalloc.h>
+ZEN_THIRD_PARTY_INCLUDES_END
 #endif
 
+ZEN_THIRD_PARTY_INCLUDES_START
+#include <fmt/format.h>
 #include <asio.hpp>
+#include <lua.hpp>
+ZEN_THIRD_PARTY_INCLUDES_END
+
 #include <exception>
 #include <list>
-#include <lua.hpp>
 #include <optional>
 #include <regex>
 #include <set>
@@ -64,7 +68,9 @@
 
 #if USE_SENTRY
 #	define SENTRY_BUILD_STATIC 1
+ZEN_THIRD_PARTY_INCLUDES_START
 #	include <sentry.h>
+ZEN_THIRD_PARTY_INCLUDES_END
 
 // Sentry currently does not automatically add all required Windows
 // libraries to the linker when consumed via vcpkg
-- 
cgit v1.2.3