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-test/zenserver-test.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'zenserver-test/zenserver-test.cpp')

diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index fe21aa834..9c9b73042 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -23,7 +23,9 @@
 #include <zenutil/zenserverprocess.h>
 
 #if ZEN_USE_MIMALLOC
+ZEN_THIRD_PARTY_INCLUDES_START
 #	include <mimalloc.h>
+ZEN_THIRD_PARTY_INCLUDES_END
 #endif
 
 #include <http_parser.h>
@@ -32,7 +34,11 @@
 #	pragma comment(lib, "Crypt32.lib")
 #	pragma comment(lib, "Wldap32.lib")
 #endif
+
+ZEN_THIRD_PARTY_INCLUDES_START
 #include <cpr/cpr.h>
+#undef GetObject
+ZEN_THIRD_PARTY_INCLUDES_END
 
 #include <ppl.h>
 #include <atomic>
@@ -594,10 +600,6 @@ private:
 //////////////////////////////////////////////////////////////////////////
 
 #if 0
-#	include <cpr/cpr.h>
-
-#	pragma comment(lib, "Crypt32.lib")
-#	pragma comment(lib, "Wldap32.lib")
 
 int
 main()
-- 
cgit v1.2.3