From 258e0ce3235ee5f4735eae0f923fd95e128347cc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 11 Jun 2020 14:34:21 +0000
Subject: Not really a problem, since SHLIB_CFLAGS is empty on win32 .... still
 this is wrong...

---
 win/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win/Makefile.in b/win/Makefile.in
index 777a6d8..5943893 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -209,7 +209,7 @@ SHELL		= @SHELL@
 RM		= rm -f
 COPY		= cp
 
-CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} \
+CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 -I"${ZLIB_DIR_NATIVE}" -I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH \
 -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \
 ${AC_FLAGS} ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS}
-- 
cgit v0.12


From 71e331a3d78117563b7c07c2cec0c8a321788cd0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 12 Jun 2020 12:56:34 +0000
Subject: rules.vc: No need to redefine values which are already the default.
 tclWinPort.h: Fix comment

---
 win/rules.vc     | 5 -----
 win/tclWinPort.h | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/win/rules.vc b/win/rules.vc
index 490f9c3..073f58a 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -743,17 +743,12 @@ MSVCRT		= 0
 !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
 !message *** Doing staticpkg
 TCL_USE_STATIC_PACKAGES	= 1
-!else
-TCL_USE_STATIC_PACKAGES	= 0
 !endif
 
 !if [nmakehlp -f $(OPTS) "nothreads"]
 !message *** Compile explicitly for non-threaded tcl
 TCL_THREADS = 0
 USE_THREAD_ALLOC= 0
-!else
-TCL_THREADS    = 1
-USE_THREAD_ALLOC= 1
 !endif
 
 !if "$(TCL_MAJOR_VERSION)" == "8"
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index edbdbdd..1aaf21d 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -14,7 +14,6 @@
 #ifndef _TCLWINPORT
 #define _TCLWINPORT
 
-
 #if !defined(_WIN64) && !defined(__MINGW_USE_VC2005_COMPAT)
 /* See [Bug 3354324]: file mtime sets wrong time */
 #   define __MINGW_USE_VC2005_COMPAT
@@ -27,7 +26,7 @@
 /*
  * We must specify the lower version we intend to support.
  *
- * WINVER = 0x0500 means Windows 2000 and above
+ * WINVER = 0x0501 means Windows XP and above
  */
 
 #ifndef WINVER
-- 
cgit v0.12


From 9e628cd450bd345b32f5a0650dfa765256b18d7b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 12 Jun 2020 14:44:05 +0000
Subject: rules.vc: No need to redefine values which are already the default.
 tclWinPort.h: Fix comment

---
 win/rules.vc     | 10 +---------
 win/tclWinPort.h |  3 +--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/win/rules.vc b/win/rules.vc
index 490f9c3..d4765b9 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -730,11 +730,8 @@ MSVCRT		= 0
 !else
 !if [nmakehlp -f $(OPTS) "msvcrt"]
 !message *** Doing msvcrt
-MSVCRT		= 1
-!else
-!if !$(STATIC_BUILD)
-MSVCRT		= 1
 !else
+!if $(STATIC_BUILD)
 MSVCRT		= 0
 !endif
 !endif
@@ -743,17 +740,12 @@ MSVCRT		= 0
 !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
 !message *** Doing staticpkg
 TCL_USE_STATIC_PACKAGES	= 1
-!else
-TCL_USE_STATIC_PACKAGES	= 0
 !endif
 
 !if [nmakehlp -f $(OPTS) "nothreads"]
 !message *** Compile explicitly for non-threaded tcl
 TCL_THREADS = 0
 USE_THREAD_ALLOC= 0
-!else
-TCL_THREADS    = 1
-USE_THREAD_ALLOC= 1
 !endif
 
 !if "$(TCL_MAJOR_VERSION)" == "8"
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index aaaa9c7..5aa02f0 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -14,7 +14,6 @@
 #ifndef _TCLWINPORT
 #define _TCLWINPORT
 
-
 #if !defined(_WIN64) && !defined(__MINGW_USE_VC2005_COMPAT)
 /* See [Bug 3354324]: file mtime sets wrong time */
 #   define __MINGW_USE_VC2005_COMPAT
@@ -23,7 +22,7 @@
 /*
  * We must specify the lower version we intend to support.
  *
- * WINVER = 0x0500 means Windows 2000 and above
+ * WINVER = 0x0501 means Windows XP and above
  */
 
 #ifndef WINVER
-- 
cgit v0.12