Adapt Tk to TIP #628, so it can be compiled for Tcl 8 in a Tcl 9 buil…

…d environment
tcltk · Aug 15, 2024 · 972e0f0 · 972e0f0
1 parent f632a06
commit 972e0f0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/generic/tk.h b/generic/tk.h
@@ -17,7 +17,7 @@
 #define _TK
 
 #include <tcl.h>
-#if (TCL_MAJOR_VERSION < 8) || (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 7)
+#if (TCL_MAJOR_VERSION < 9) && defined(TCL_MINOR_VERSION) && (TCL_MINOR_VERSION < 7)
 #	error Tk 9.0 must be compiled with tcl.h from Tcl 8.7 or better
 #endif
 

diff --git a/generic/tkInt.h b/generic/tkInt.h
@@ -1330,7 +1330,7 @@ MODULE_SCOPE void	TkpCopyRegion(TkRegion dst, TkRegion src);
 # define c_class class
 #endif
 
-#if defined(_WIN32) && !defined(STATIC_BUILD) && TCL_MAJOR_VERSION < 9
+#if defined(_WIN32) && !defined(STATIC_BUILD) && (TCL_MAJOR_VERSION < 9) && defined(TCL_MINOR_VERSION)
 #   define tcl_CreateFileHandler reserved9
 #endif
 

diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c
@@ -35,7 +35,7 @@
 #undef STATIC_BUILD
 #include "tk.h"
 #include "tkPort.h"
-#if TCL_MAJOR_VERSION < 9 && TCL_MINOR_VERSION < 7
+#if (TCL_MAJOR_VERSION < 9) && defined(TCL_MINOR_VERSION) && (TCL_MINOR_VERSION < 7)
 #   define Tcl_LibraryInitProc Tcl_PackageInitProc
 #   define Tcl_StaticLibrary Tcl_StaticPackage
 #endif
@@ -107,7 +107,7 @@ main(
 {
 #ifdef TK_LOCAL_MAIN_HOOK
     TK_LOCAL_MAIN_HOOK(&argc, &argv);
-#elif (TCL_MAJOR_VERSION > 8) || (TCL_MINOR_VERSION > 6)
+#elif TCL_MAJOR_VERSION > 8 || !defined(TCL_MINOR_VERSION) || TCL_MINOR_VERSION > 6
     /* This doesn't work with Tcl 8.6 */
     TclZipfs_AppHook(&argc, &argv);
 #endif

diff --git a/win/winMain.c b/win/winMain.c
@@ -38,7 +38,7 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <tchar.h>
-#if TCL_MAJOR_VERSION < 9 && TCL_MINOR_VERSION < 7
+#if (TCL_MAJOR_VERSION < 9) && defined(TCL_MINOR_VERSION) && (TCL_MINOR_VERSION < 7)
 #   define Tcl_LibraryInitProc Tcl_PackageInitProc
 #   define Tcl_StaticLibrary Tcl_StaticPackage
 #endif
@@ -56,7 +56,7 @@ extern Tcl_LibraryInitProc Tktest_Init;
 #endif /* TK_TEST */
 
 #if !defined(TCL_USE_STATIC_PACKAGES)
-#   if TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6
+#   if TCL_MAJOR_VERSION > 8 || !defined(TCL_MINOR_VERSION) || TCL_MINOR_VERSION > 6
 #	define TCL_USE_STATIC_PACKAGES 1
 #   else
 #	define TCL_USE_STATIC_PACKAGES 0
@@ -191,7 +191,7 @@ _tWinMain(
 
 #ifdef TK_LOCAL_MAIN_HOOK
     TK_LOCAL_MAIN_HOOK(&argc, &argv);
-#elif defined(UNICODE) && ((TCL_MAJOR_VERSION > 8) || (TCL_MINOR_VERSION > 6))
+#elif defined(UNICODE) && ((TCL_MAJOR_VERSION > 8) || !defined(TCL_MINOR_VERSION) || (TCL_MINOR_VERSION > 6))
     /* This doesn't work on Windows without UNICODE, neither does it work with Tcl 8.6 */
     TclZipfs_AppHook(&argc, &argv);
 #endif