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/upstream/jupiter.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'zenserver/upstream/jupiter.cpp')

diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index 1c43f1bc6..556a2124d 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -6,21 +6,16 @@
 #include "diag/formatters.h"
 #include "diag/logging.h"
 
-#include <fmt/format.h>
 #include <zencore/compactbinary.h>
 #include <zencore/iobuffer.h>
 #include <zencore/iohash.h>
 #include <zencore/string.h>
 #include <zencore/thread.h>
 
-// For some reason, these don't seem to stick, so we disable the warnings
-//#	define _SILENCE_CXX17_C_HEADER_DEPRECATION_WARNING 1
-//#	define _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS		1
-#pragma warning(push)
-#pragma warning(disable : 4004)
-#pragma warning(disable : 4996)
+ZEN_THIRD_PARTY_INCLUDES_START
 #include <cpr/cpr.h>
-#pragma warning(pop)
+#include <fmt/format.h>
+ZEN_THIRD_PARTY_INCLUDES_END
 
 #if ZEN_PLATFORM_WINDOWS
 #	pragma comment(lib, "Crypt32.lib")
-- 
cgit v1.2.3