From 3324cfce0b87bc895a17e5a8d02b2fd58c613fbd Mon Sep 17 00:00:00 2001
From: Brad House <brad@brad-house.com>
Date: Thu, 28 Dec 2023 12:44:57 -0500
Subject: [PATCH] set winver consistently across build systems

---
 Makefile.Watcom        |  2 +-
 Makefile.msvc          |  2 +-
 src/lib/config-win32.h | 18 +++++++-----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Makefile.Watcom b/Makefile.Watcom
index fddba58e..0cbae5c5 100644
--- a/Makefile.Watcom
+++ b/Makefile.Watcom
@@ -43,7 +43,7 @@ CP = copy
 
 CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -aa   &
          -wcd=201 -bt=nt -d+ -dWIN32 -dCARES_BUILDING_LIBRARY &
-         -dNTDDI_VERSION=0x06000000 -I. -I.\include -I.\src\lib $(SYS_INCL)
+         -dNTDDI_VERSION=0x06020000 -I. -I.\include -I.\src\lib $(SYS_INCL)
 
 LFLAGS = option quiet, map, caseexact, eliminate
 
diff --git a/Makefile.msvc b/Makefile.msvc
index 0e774fbf..c89454ec 100644
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -180,7 +180,7 @@ CFLAGS  = /UWIN32 /DWATT32 /I$(WATT_ROOT)\inc
 EX_LIBS_REL = $(WATT_ROOT)\lib\wattcpvc_imp.lib
 EX_LIBS_DBG = $(WATT_ROOT)\lib\wattcpvc_imp_d.lib
 !ELSE
-CFLAGS  = /DWIN32 /D_WIN32_WINNT=0x0600
+CFLAGS  = /DWIN32 /D_WIN32_WINNT=0x0602
 EX_LIBS_REL = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib
 EX_LIBS_DBG = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib
 !ENDIF
diff --git a/src/lib/config-win32.h b/src/lib/config-win32.h
index e275fbf0..50d77313 100644
--- a/src/lib/config-win32.h
+++ b/src/lib/config-win32.h
@@ -260,22 +260,18 @@
 #  define _CRT_NONSTDC_NO_DEPRECATE 1
 #endif
 
-/* Set the Target to Vista. However, any symbols required above Win2000
- * should be loaded via LoadLibrary() */
+/* Set the Target to Win8 */
 #if defined(_MSC_VER) && (_MSC_VER >= 1500)
-#  define VS2008_MIN_TARGET 0x0600
+#  define MSVC_MIN_TARGET 0x0602
 #endif
 
-/* VS2008 default target settings and minimum build target check. */
+/* MSVC default target settings */
 #if defined(_MSC_VER) && (_MSC_VER >= 1500)
 #  ifndef _WIN32_WINNT
-#    define _WIN32_WINNT VS2008_MIN_TARGET
+#    define _WIN32_WINNT MSVC_MIN_TARGET
 #  endif
 #  ifndef WINVER
-#    define WINVER VS2008_MIN_TARGET
-#  endif
-#  if (_WIN32_WINNT < VS2008_MIN_TARGET) || (WINVER < VS2008_MIN_TARGET)
-#    error VS2008 does not support Windows build targets prior to Windows 2000
+#    define WINVER MSVC_MIN_TARGET
 #  endif
 #endif
 
@@ -283,10 +279,10 @@
    target is Windows Vista. */
 #if defined(__POCC__) && (__POCC__ >= 500)
 #  ifndef _WIN32_WINNT
-#    define _WIN32_WINNT 0x0600
+#    define _WIN32_WINNT 0x0602
 #  endif
 #  ifndef WINVER
-#    define WINVER 0x0600
+#    define WINVER 0x0602
 #  endif
 #endif