Merge 8.6

4 files changed, 58 insertions, 58 deletions

diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 7f7a182..0e47d2f 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -25,7 +25,6 @@ package require tcltests
 
 # Custom constraints used in this file
 testConstraint testchannel	[llength [info commands testchannel]]
-testConstraint knownMsvcBug [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match windows $::env(TRAVIS_OS_NAME)]}]
 
 #----------------------------------------------------------------------
 
@@ -811,7 +810,7 @@ test iocmd-21.19 {chan create, init failure -> no channel, no finalize} -match g
     rename foo {}
     set res
 } -result {{} {initialize rc* {read write}} 1 {*all required methods*} {}}
-test iocmd-21.20 {Bug 88aef05cda} -constraints knownMsvcBug -setup {
+test iocmd-21.20 {Bug 88aef05cda} -setup {
     proc foo {method chan args} {
 	switch -- $method blocking {
 	    chan configure $chan -blocking [lindex $args 0]
@@ -825,11 +824,11 @@ test iocmd-21.20 {Bug 88aef05cda} -constraints knownMsvcBug -setup {
     }
     set ch [chan create {read write} foo]
 } -body {
-    list [catch {chan configure $ch -blocking 0} m] $m
+    chan configure $ch -blocking 0
 } -cleanup {
     close $ch
     rename foo {}
-} -match glob -result {1 {*nested eval*}}
+} -match glob -returnCodes 1 -result {*(infinite loop?)*}
 test iocmd-21.21 {[close] in [read] segfaults} -setup {
     proc foo {method chan args} {
 	switch -- $method initialize {
diff --git a/tests/namespace.test b/tests/namespace.test
index e90c753..0d93092 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -2624,6 +2624,7 @@ test namespace-51.6 {name resolution path control} -body {
     namespace delete ::test_ns_1
     catch {rename ::pathtestB {}}
     catch {rename ::pathtestD {}}
+    catch {rename ::pathtestC {}}
 }
 test namespace-51.7 {name resolution path control} -body {
     namespace eval ::test_ns_1 {
diff --git a/win/makefile.vc b/win/makefile.vc
index 27cbc8a..5711d23 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -427,7 +427,7 @@ PKGSDIR		= $(ROOT)\pkgs
 # Additional include and C macro definitions for the implicit rules

 # defined in rules.vc

 PRJ_INCLUDES	= -I"$(TOMMATHDIR)"

-PRJ_DEFINES	= -DTCL_TOMMATH -DMP_PREC=4 -Dinline=__inline -DHAVE_ZLIB=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE

+PRJ_DEFINES	= /DTCL_TOMMATH /DMP_PREC=4 /Dinline=__inline /DHAVE_ZLIB=1 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE

 

 # Additional Link libraries needed beyond those in rules.vc

 PRJ_LIBS   = netapi32.lib user32.lib userenv.lib ws2_32.lib

@@ -733,12 +733,12 @@ gendate:
 #---------------------------------------------------------------------

 

 $(TMP_DIR)\testMain.obj: $(WIN_DIR)\tclAppInit.c

-	$(cc32) $(appcflags) -DTCL_TEST \

-	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

+	$(cc32) $(appcflags) /DTCL_TEST \

+	    /DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

 

 $(TMP_DIR)\tclMain2.obj: $(GENERICDIR)\tclMain.c

-	$(cc32) $(pkgcflags) -DTCL_ASCII_MAIN \

+	$(cc32) $(pkgcflags) /DTCL_ASCII_MAIN \

 	    -Fo$@ $?

 

 $(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c

@@ -758,40 +758,40 @@ $(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c
 

 $(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c

 	$(cc32) $(pkgcflags) \

-	-DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""	\

-	-DCFG_RUNTIME_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""     \

-	-DCFG_RUNTIME_DLLFILE="\"$(CFG_RUNTIME_DLLFILE:\=\\)\""     \

-	-DCFG_RUNTIME_ZIPFILE="\"$(CFG_RUNTIME_ZIPFILE:\=\\)\""     \

+	/DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

+	/DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \

+	/DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

+	/DCFG_INSTALL_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \

+	/DCFG_INSTALL_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""	\

+	/DCFG_RUNTIME_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

+	/DCFG_RUNTIME_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \

+	/DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

+	/DCFG_RUNTIME_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \

+	/DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""     \

+	/DCFG_RUNTIME_DLLFILE="\"$(CFG_RUNTIME_DLLFILE:\=\\)\""     \

+	/DCFG_RUNTIME_ZIPFILE="\"$(CFG_RUNTIME_ZIPFILE:\=\\)\""     \

 	-Fo$@ $?

 

 $(TMP_DIR)\tclAppInit.obj: $(WIN_DIR)\tclAppInit.c

 	$(cc32) $(appcflags) \

-	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

+	    /DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

 

 ### The following objects should be built using the stub interfaces

 

 $(TMP_DIR)\tclWinReg.obj: $(WIN_DIR)\tclWinReg.c

 !if $(STATIC_BUILD)

-	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?

+	$(cc32) $(appcflags) /DSTATIC_BUILD -Fo$@ $?

 !else

-	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?

+	$(cc32) $(appcflags) /DUSE_TCL_STUBS -Fo$@ $?

 !endif

 

 

 $(TMP_DIR)\tclWinDde.obj: $(WIN_DIR)\tclWinDde.c

 !if $(STATIC_BUILD)

-	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?

+	$(cc32) $(appcflags) /DSTATIC_BUILD -Fo$@ $?

 !else

-	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?

+	$(cc32) $(appcflags) /DUSE_TCL_STUBS -Fo$@ $?

 !endif

 

 

@@ -830,7 +830,7 @@ depend:
 	@echo Build tclsh first!

 !else

 	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \

-		-passthru:"-DBUILD_tcl $(TCL_INCLUDES) $(PRJ_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \

+		-passthru:"/DBUILD_tcl $(TCL_INCLUDES) $(PRJ_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \

 		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WIN_DIR),$$(WIN_DIR) @<<

 $(TCLOBJS)

 <<

diff --git a/win/rules.vc b/win/rules.vc
index 8487e41..7210ab6 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1268,59 +1268,59 @@ INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
 # baselibs - minimum Windows libraries required. Parent makefile can

 #    define PRJ_LIBS before including rules.rc if additional libs are needed

 

-OPTDEFINES	= -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) -DSTDC_HEADERS

+OPTDEFINES	= /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS

 

 !if $(TCL_MEM_DEBUG)

-OPTDEFINES	= $(OPTDEFINES) -DTCL_MEM_DEBUG

+OPTDEFINES	= $(OPTDEFINES) /DTCL_MEM_DEBUG

 !endif

 !if $(TCL_COMPILE_DEBUG)

-OPTDEFINES	= $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS

+OPTDEFINES	= $(OPTDEFINES) /DTCL_COMPILE_DEBUG /DTCL_COMPILE_STATS

 !endif

 !if $(TCL_THREADS) && $(TCL_VERSION) < 87

-OPTDEFINES	= $(OPTDEFINES) -DTCL_THREADS=1

+OPTDEFINES	= $(OPTDEFINES) /DTCL_THREADS=1

 !if $(USE_THREAD_ALLOC) && $(TCL_VERSION) < 87

-OPTDEFINES	= $(OPTDEFINES) -DUSE_THREAD_ALLOC=1

+OPTDEFINES	= $(OPTDEFINES) /DUSE_THREAD_ALLOC=1

 !endif

 !endif

 !if $(STATIC_BUILD)

-OPTDEFINES	= $(OPTDEFINES) -DSTATIC_BUILD

+OPTDEFINES	= $(OPTDEFINES) /DSTATIC_BUILD

 !endif

 !if $(TCL_NO_DEPRECATED)

-OPTDEFINES	= $(OPTDEFINES) -DTCL_NO_DEPRECATED

+OPTDEFINES	= $(OPTDEFINES) /DTCL_NO_DEPRECATED

 !endif

 

 !if $(USE_STUBS)

 # Note we do not define USE_TCL_STUBS even when building tk since some

 # test targets in tk do not use stubs

 !if ! $(DOING_TCL)

-USE_STUBS_DEFS  = -DUSE_TCL_STUBS -DUSE_TCLOO_STUBS

+USE_STUBS_DEFS  = /DUSE_TCL_STUBS /DUSE_TCLOO_STUBS

 !if $(NEED_TK)

-USE_STUBS_DEFS  = $(USE_STUBS_DEFS) -DUSE_TK_STUBS

+USE_STUBS_DEFS  = $(USE_STUBS_DEFS) /DUSE_TK_STUBS

 !endif

 !endif

 !endif # USE_STUBS

 

 !if !$(DEBUG)

-OPTDEFINES	= $(OPTDEFINES) -DNDEBUG

+OPTDEFINES	= $(OPTDEFINES) /DNDEBUG

 !if $(OPTIMIZING)

-OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_OPTIMIZED

+OPTDEFINES	= $(OPTDEFINES) /DTCL_CFG_OPTIMIZED

 !endif

 !endif

 !if $(PROFILE)

-OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_PROFILED

+OPTDEFINES	= $(OPTDEFINES) /DTCL_CFG_PROFILED

 !endif

 !if "$(MACHINE)" == "AMD64"

-OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_DO64BIT

+OPTDEFINES	= $(OPTDEFINES) /DTCL_CFG_DO64BIT

 !endif

 !if $(VCVERSION) < 1300

-OPTDEFINES	= $(OPTDEFINES) -DNO_STRTOI64

+OPTDEFINES	= $(OPTDEFINES) /DNO_STRTOI64

 !endif

 

 !if "$(_USE_64BIT_TIME_T)" == "1"

-OPTDEFINES	= $(OPTDEFINES) -D_USE_64BIT_TIME_T

+OPTDEFINES	= $(OPTDEFINES) /D_USE_64BIT_TIME_T

 !endif

 !if "$(TCL_UTF_MAX)" == "6"

-OPTDEFINES	= $(OPTDEFINES) -DTCL_UTF_MAX=6

+OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=6

 !endif

 

 # _ATL_XP_TARGETING - Newer SDK's need this to build for XP

@@ -1347,10 +1347,10 @@ COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE
 # Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME

 # so we pass both

 !if !$(DOING_TCL) && !$(DOING_TK)

-PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

-               -DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

-               -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \

-               -DMODULE_SCOPE=extern

+PKGNAMEFLAGS = /DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

+               /DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

+               /DPACKAGE_VERSION="\"$(DOTVERSION)\"" \

+               /DMODULE_SCOPE=extern

 !endif

 

 # crt picks the C run time based on selected OPTS

@@ -1397,7 +1397,7 @@ cwarn = $(cwarn) -wd4311 -wd4312
 

 ### Common compiler options that are architecture specific

 !if "$(MACHINE)" == "ARM"

-carch = -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE

+carch = /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE

 !else

 carch =

 !endif

@@ -1427,11 +1427,11 @@ cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\ $(cdebug)
 

 appcflags_nostubs = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES)

 appcflags = $(appcflags_nostubs) $(USE_STUBS_DEFS)

-pkgcflags = $(appcflags) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)

-pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)

+pkgcflags = $(appcflags) $(PKGNAMEFLAGS) /DBUILD_$(PROJECT)

+pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) /DBUILD_$(PROJECT)

 

 # stubscflags contains $(cflags) plus flags used for building a stubs

-# library for the package.  Note: -DSTATIC_BUILD is defined in

+# library for the package.  Note: /DSTATIC_BUILD is defined in

 # $(OPTDEFINES) only if the OPTS configuration indicates a static

 # library. However the stubs library is ALWAYS static hence included

 # here irrespective of the OPTS setting.

@@ -1441,7 +1441,7 @@ pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
 # so we do not remove it from cflags. -GL may prevent extensions

 # compiled with one VC version to fail to link against stubs library

 # compiled with another VC version. Check for this and fix accordingly.

-stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl -DSTATIC_BUILD $(INCLUDES) $(USE_STUBS_DEFS)

+stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl /DSTATIC_BUILD $(INCLUDES) $(USE_STUBS_DEFS)

 

 # Link flags

 

@@ -1506,13 +1506,13 @@ CONEXECMD = $(link32) $(conlflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)
 GUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)

 RESCMD  = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \

 	    $(TCL_INCLUDES) \

-	    -DDEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \

-	    -DCOMMAVERSION=$(DOTVERSION:.=,),0 \

-	    -DDOTVERSION=\"$(DOTVERSION)\" \

-	    -DVERSION=\"$(VERSION)\" \

-	    -DSUFX=\"$(SUFX:t=)\" \

-	    -DPROJECT=\"$(PROJECT)\" \

-	    -DPRJLIBNAME=\"$(PRJLIBNAME)\"

+	    /DDEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \

+	    /DCOMMAVERSION=$(DOTVERSION:.=,),0 \

+	    /DDOTVERSION=\"$(DOTVERSION)\" \

+	    /DVERSION=\"$(VERSION)\" \

+	    /DSUFX=\"$(SUFX:t=)\" \

+	    /DPROJECT=\"$(PROJECT)\" \

+	    /DPRJLIBNAME=\"$(PRJLIBNAME)\"

 

 !ifndef DEFAULT_BUILD_TARGET

 DEFAULT_BUILD_TARGET = $(PROJECT)