Merge 8.6

7 files changed, 21 insertions, 22 deletions

diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index 9b02c46..10c8b4d 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -79,7 +79,7 @@ Tcl_InitStubs(
 	}
 	if (stubsPtr && (stubsPtr->magic == TCL_STUB_MAGIC)
 		&& ((exact|0x010000) == 0x070800)) {
-	    /* We are running in Tcl 9.x, but extension is compiled with 8.6 or 8.7 */
+	    /* We are running in Tcl 9.x, but extension is compiled with 8.6 */
 	    stubsPtr->tcl_SetObjResult(interp, stubsPtr->tcl_ObjPrintf(
 		    "this extension is compiled for Tcl %d.%d",
 		    (exact & 0x0FF00)>>8, (exact & 0x0FF0000)>>16));
diff --git a/generic/tclUniData.c b/generic/tclUniData.c
index 612b7a8..c2b11cb 100644
--- a/generic/tclUniData.c
+++ b/generic/tclUniData.c
@@ -195,7 +195,7 @@ static const unsigned short pageMap[] = {
     1344, 1344, 1344, 10112, 10144, 1344, 10176, 1344, 10208, 10240, 10272,
     10304, 10336, 10368, 1344, 1344, 1344, 10400, 10432, 64, 10464, 10496,
     10528, 4736, 10560, 10592
-#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6
+#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8
     ,10624, 10656, 10688, 3296, 1344, 1344, 1344, 10720, 10752, 10784,
     10816, 10848, 10880, 10912, 8032, 10944, 3296, 3296, 3296, 3296, 9216,
     1344, 10976, 11008, 1344, 11040, 11072, 11104, 11136, 1344, 11168,
@@ -1180,7 +1180,7 @@ static const unsigned char groupMap[] = {
     15, 15, 15, 15, 15, 0, 0, 15, 15, 15, 15, 15, 15, 0, 0, 15, 15, 15,
     0, 0, 0, 4, 4, 7, 11, 14, 4, 4, 0, 14, 7, 7, 7, 7, 14, 14, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 17, 17, 17, 14, 14, 0, 0
-#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6
+#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8
     ,15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 15, 15, 15, 15,
     15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
     15, 15, 15, 15, 15, 0, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
@@ -1733,7 +1733,7 @@ static const int groups[] = {
     10370, 10049, 10114, 8769, 8834
 };
 
-#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6
+#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8
 #   define UNICODE_OUT_OF_RANGE(ch) (((ch) & 0x1FFFFF) >= 0x323C0)
 #else
 #   define UNICODE_OUT_OF_RANGE(ch) (((ch) & 0x1F0000) != 0)
@@ -1792,7 +1792,7 @@ enum {
  * Unicode character tables.
  */
 
-#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6
+#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8
 #   define GetUniCharInfo(ch) (groups[groupMap[pageMap[((ch) & 0x1FFFFF) >> OFFSET_BITS] | ((ch) & ((1 << OFFSET_BITS)-1))]])
 #else
 #   define GetUniCharInfo(ch) (groups[groupMap[pageMap[((ch) & 0xFFFF) >> OFFSET_BITS] | ((ch) & ((1 << OFFSET_BITS)-1))]])
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl
index ace1681..542f5e5 100644
--- a/library/dde/pkgIndex.tcl
+++ b/library/dde/pkgIndex.tcl
@@ -2,8 +2,7 @@ if {[info sharedlibextension] != ".dll"} return
 if {[package vsatisfies [package provide Tcl] 9.0-]} {
     package ifneeded dde 1.4.5 \
 	    [list load [file join $dir tcl9dde14.dll] Dde]
-} elseif {![package vsatisfies [package provide Tcl] 8.7]
-	&& [::tcl::pkgconfig get debug]} {
+} elseif {[::tcl::pkgconfig get debug]} {
     package ifneeded dde 1.4.5 \
 	    [list load [file join $dir tcldde14g.dll] Dde]
 } else {
diff --git a/tools/uniParse.tcl b/tools/uniParse.tcl
index 3acf19c..689b121 100644
--- a/tools/uniParse.tcl
+++ b/tools/uniParse.tcl
@@ -212,7 +212,7 @@ static const unsigned short pageMap\[\] = {"
 	    puts $f $line
 	    set lastpage [expr {[lindex $line end] >> $shift}]
 	    puts stdout "lastpage: $lastpage"
-	    puts $f "#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6"
+	    puts $f "#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8"
 	    set line "    ,"
 	}
 	append line [lindex $pMap $i]
@@ -242,7 +242,7 @@ static const unsigned char groupMap\[\] = {"
 	set lastj [expr {[llength $page] - 1}]
 	if {$i == ($lastpage + 1)} {
 	    puts $f [string trimright $line " \t,"]
-	    puts $f "#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6"
+	    puts $f "#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8"
 	    set line "    ,"
 	}
 	for {set j 0} {$j <= $lastj} {incr j} {
@@ -342,7 +342,7 @@ static const int groups\[\] = {"
     puts $f $line
     puts -nonewline $f "};
 
-#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6
+#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8
 #   define UNICODE_OUT_OF_RANGE(ch) (((ch) & 0x1FFFFF) >= [format 0x%X $next])
 #else
 #   define UNICODE_OUT_OF_RANGE(ch) (((ch) & 0x1F0000) != 0)
@@ -401,7 +401,7 @@ enum {
  * Unicode character tables.
  */
 
-#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6
+#if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8
 #   define GetUniCharInfo(ch) (groups\[groupMap\[pageMap\[((ch) & 0x1FFFFF) >> OFFSET_BITS\] | ((ch) & ((1 << OFFSET_BITS)-1))\]\])
 #else
 #   define GetUniCharInfo(ch) (groups\[groupMap\[pageMap\[((ch) & 0xFFFF) >> OFFSET_BITS\] | ((ch) & ((1 << OFFSET_BITS)-1))\]\])
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index 8d967e8..2a20dc1 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -92,8 +92,8 @@ main(
 
 #ifdef TCL_LOCAL_MAIN_HOOK
     TCL_LOCAL_MAIN_HOOK(&argc, &argv);
-#elif (TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6) && (!defined(_WIN32) || defined(UNICODE))
-    /* New in Tcl 8.7. This doesn't work on Windows without UNICODE */
+#elif TCL_MAJOR_VERSION > 8 && (!defined(_WIN32) || defined(UNICODE))
+    /* New in Tcl 9.0. This doesn't work on Windows without UNICODE */
     TclZipfs_AppHook(&argc, &argv);
 #endif
 
diff --git a/win/rules.vc b/win/rules.vc
index 0b47765..15ae8a0 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -804,10 +804,10 @@ DOTSEPARATED=$(DOTSEPARATED:b=.)
 # MSVCRT  - 1 -> link to dynamic C runtime even when building static Tcl build

 #           0 -> link to static C runtime for static Tcl build.

 #           Does not impact shared Tcl builds (STATIC_BUILD == 0)

-#           Default: 1 for Tcl 8.7 and up, 0 otherwise.

+#           Default: 1 for Tcl 9.0 and up, 0 otherwise.

 # TCL_USE_STATIC_PACKAGES - 1 -> statically link the registry and dde extensions

 #           in the Tcl and Wish shell. 0 -> keep them as shared libraries. Does

-#           not impact shared Tcl builds. Implied by STATIC_BUILD since Tcl 8.7.

+#           not impact shared Tcl builds. Implied by STATIC_BUILD since Tcl 9.0.

 # USE_THREAD_ALLOC - 1 -> Use a shared global free pool for allocation.

 #           0 -> Use the non-thread allocator.

 # UNCHECKED - 1 -> when doing a debug build with symbols, use the release

@@ -1042,7 +1042,7 @@ WARNINGS		    = $(WARNINGS) -Wp64
 # different compilers, build configurations etc.,

 #

 # Naming convention (suffixes):

-#   t = full thread support. (Not used for Tcl >= 8.7)

+#   t = full thread support. (Not used for Tcl >= 9.0)

 #   s = static library (as opposed to an import library)

 #   g = linked to the debug enabled C run-time.

 #   x = special static build when it links to the dynamic C run-time.

@@ -1173,7 +1173,7 @@ TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub.lib
 !endif

 TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib

 # When building extensions, may be linking against Tcl that does not add

-# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

+# "t" suffix (e.g. 8.6). If lib not found check for that possibility.

 !if !exist("$(TCLIMPLIB)")

 TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)t$(SUFX:t=).lib

 !endif

@@ -1197,7 +1197,7 @@ TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub.lib
 !endif

 TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib

 # When building extensions, may be linking against Tcl that does not add

-# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

+# "t" suffix (e.g. 8.6). If lib not found check for that possibility.

 !if !exist("$(TCLIMPLIB)")

 TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)t$(SUFX:t=).lib

 !endif

@@ -1262,7 +1262,7 @@ WISH		= $(_TKDIR)\bin\$(WISHNAME)
 TKSTUBLIB	= $(_TKDIR)\lib\$(TKSTUBLIBNAME)

 TKIMPLIB	= $(_TKDIR)\lib\$(TKIMPLIBNAME)

 # When building extensions, may be linking against Tk that does not add

-# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

+# "t" suffix (e.g. 8.6). If lib not found check for that possibility.

 !if !exist("$(TKIMPLIB)")

 TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX:t=).lib

 TKIMPLIB	= $(_TKDIR)\lib\$(TKIMPLIBNAME)

@@ -1276,7 +1276,7 @@ WISH		= $(_TKDIR)\win\$(BUILDDIRTOP)\$(WISHNAME)
 TKSTUBLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKSTUBLIBNAME)

 TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)

 # When building extensions, may be linking against Tk that does not add

-# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

+# "t" suffix (e.g. 8.6). If lib not found check for that possibility.

 !if !exist("$(TKIMPLIB)")

 TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX:t=).lib

 TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)

diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index c293952..326d054 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.c
@@ -142,8 +142,8 @@ _tmain(
 
 #ifdef TCL_LOCAL_MAIN_HOOK
     TCL_LOCAL_MAIN_HOOK(&argc, &argv);
-#elif (TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6) && (!defined(_WIN32) || defined(UNICODE))
-    /* New in Tcl 8.7. This doesn't work on Windows without UNICODE */
+#elif TCL_MAJOR_VERSION > 8 && (!defined(_WIN32) || defined(UNICODE))
+    /* New in Tcl 9.0. This doesn't work on Windows without UNICODE */
     TclZipfs_AppHook(&argc, &argv);
 #endif