Merge 8.7

5 files changed, 11 insertions, 8 deletions

diff --git a/doc/string.n b/doc/string.n
index 72c7913..44d621d 100644
--- a/doc/string.n
+++ b/doc/string.n
@@ -362,21 +362,21 @@ specified using the forms described in \fBSTRING INDICES\fR.
 Returns a value equal to \fIstring\fR except that any leading or
 trailing characters present in the string given by \fIchars\fR are removed.  If
 \fIchars\fR is not specified then white space is removed (any character
-for which \fBstring is space\fR returns 1, and "\0").
+for which \fBstring is space\fR returns 1, and "\e0").
 .TP
 \fBstring trimleft \fIstring\fR ?\fIchars\fR?
 .
 Returns a value equal to \fIstring\fR except that any leading
 characters present in the string given by \fIchars\fR are removed.  If
 \fIchars\fR is not specified then white space is removed (any character
-for which \fBstring is space\fR returns 1, and "\0").
+for which \fBstring is space\fR returns 1, and "\e0").
 .TP
 \fBstring trimright \fIstring\fR ?\fIchars\fR?
 .
 Returns a value equal to \fIstring\fR except that any trailing
 characters present in the string given by \fIchars\fR are removed.  If
 \fIchars\fR is not specified then white space is removed (any character
-for which \fBstring is space\fR returns 1, and "\0").
+for which \fBstring is space\fR returns 1, and "\e0").
 .SS "OBSOLETE SUBCOMMANDS"
 .PP
 These subcommands are currently supported, but are likely to go away in a
diff --git a/win/rules.vc b/win/rules.vc
index 44e8704..b683651 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1278,9 +1278,9 @@ OPTDEFINES	= $(OPTDEFINES) -DTCL_MEM_DEBUG
 !if $(TCL_COMPILE_DEBUG)

 OPTDEFINES	= $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS

 !endif

-!if $(TCL_THREADS) && $(TCL_VERSION) <= 86

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

 OPTDEFINES	= $(OPTDEFINES) -DTCL_THREADS=1

-!if $(USE_THREAD_ALLOC)

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

 OPTDEFINES	= $(OPTDEFINES) -DUSE_THREAD_ALLOC=1

 !endif

 !endif

@@ -1751,6 +1751,9 @@ TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"
 !if defined(CORE_MACHINE) && "$(CORE_MACHINE)" != "$(MACHINE)"

 !error ERROR: Build target ($(MACHINE)) does not match the Tcl library architecture ($(CORE_MACHINE)).

 !endif

+!if $(TCL_VERSION) < 87 && defined(CORE_USE_THREAD_ALLOC) && $(CORE_USE_THREAD_ALLOC) != $(USE_THREAD_ALLOC)

+!message WARNING: Value of USE_THREAD_ALLOC ($(USE_THREAD_ALLOC)) does not match its Tcl core value ($(CORE_USE_THREAD_ALLOC)).

+!endif

 !if defined(CORE_DEBUG) && $(CORE_DEBUG) != $(DEBUG)

 !message WARNING: Value of DEBUG ($(DEBUG)) does not match its Tcl library configuration ($(DEBUG)).

 !endif

diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 2058889..3fe855f 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -178,7 +178,7 @@ Dde_Init(
 
     Tcl_CreateObjCommand(interp, "dde", DdeObjCmd, NULL, NULL);
     Tcl_CreateExitHandler(DdeExitProc, NULL);
-    return Tcl_PkgProvide(interp, TCL_DDE_PACKAGE_NAME, TCL_DDE_VERSION);
+    return Tcl_PkgProvideEx(interp, TCL_DDE_PACKAGE_NAME, TCL_DDE_VERSION, NULL);
 }
 
 /*
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 3f8b546..1a5ce36 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -19,7 +19,7 @@
 #define __MINGW_USE_VC2005_COMPAT
 #endif
 
-#if !defined(_WIN64) && !defined(__MINGW_USE_VC2005_COMPAT) && defined(BUILD_tcl)
+#if !defined(_WIN64) && !defined(__MINGW_USE_VC2005_COMPAT)
 /* See [Bug 3354324]: file mtime sets wrong time */
 #   define _USE_32BIT_TIME_T
 #endif
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index ee13dbb..f89d120 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -188,7 +188,7 @@ Registry_Init(
     cmd = Tcl_CreateObjCommand(interp, "registry", RegistryObjCmd,
 	    interp, DeleteCmd);
     Tcl_SetAssocData(interp, REGISTRY_ASSOC_KEY, NULL, cmd);
-    return Tcl_PkgProvide(interp, "registry", "1.3.3");
+    return Tcl_PkgProvideEx(interp, "registry", "1.3.3", NULL);
 }
 
 /*