summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-03-15 11:34:29 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-03-15 11:34:29 (GMT)
commitd59be377f95879a31e6eb5e91e0cfd358b0a1a42 (patch)
treebfc625a2d71cd3c7b1efa26ba11070622ac3a91a
parentbfe8b898cef5dee7be36a12e1125f870a70805fb (diff)
downloadtk-d59be377f95879a31e6eb5e91e0cfd358b0a1a42.zip
tk-d59be377f95879a31e6eb5e91e0cfd358b0a1a42.tar.gz
tk-d59be377f95879a31e6eb5e91e0cfd358b0a1a42.tar.bz2
Make tk.h usable for compilation with Tcl 9.0 (novem) as well.
-rw-r--r--generic/tk.h2
-rw-r--r--generic/tkTest.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/tk.h b/generic/tk.h
index f51d793..9403f31 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -17,7 +17,7 @@
#define _TK
#include <tcl.h>
-#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6)
+#if (TCL_MAJOR_VERSION < 8) || (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6)
# error Tk 8.7 must be compiled with tcl.h from Tcl 8.6 or better
#endif
diff --git a/generic/tkTest.c b/generic/tkTest.c
index fa9e073..42fc437 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -227,7 +227,7 @@ Tktest_Init(
{
static int initialized = 0;
- if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
+ if (Tcl_InitStubs(interp, "8.6", 0) == NULL) {
return TCL_ERROR;
}
if (Tk_InitStubs(interp, TK_VERSION, 0) == NULL) {