From 9e628cd450bd345b32f5a0650dfa765256b18d7b Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" 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