summaryrefslogtreecommitdiffstats
path: root/generic/tk.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-03-22 11:44:36 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-03-22 11:44:36 (GMT)
commit314ca5019e04ec53c1ea17f8f7443f6eac02a5ba (patch)
tree631aa047f593787a41cd55d8be0fdcec04984c76 /generic/tk.h
parent63504284a60a6ae199422ecb41637700339cd333 (diff)
parentde3f6dd4ea12576354f6128c2c982bb648c53f64 (diff)
downloadtk-314ca5019e04ec53c1ea17f8f7443f6eac02a5ba.zip
tk-314ca5019e04ec53c1ea17f8f7443f6eac02a5ba.tar.gz
tk-314ca5019e04ec53c1ea17f8f7443f6eac02a5ba.tar.bz2
Fix test-case bind-27.2 on X11 (it worked on win32)bug_38dc27bd1d0ecd68
Merge trunk.
Diffstat (limited to 'generic/tk.h')
-rw-r--r--generic/tk.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tk.h b/generic/tk.h
index 6abb05e..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
@@ -59,8 +59,8 @@ extern "C" {
* and update the version numbers:
*
* library/tk.tcl (1 LOC patch)
- * unix/configure.in (2 LOC Major, 2 LOC minor, 1 LOC patch)
- * win/configure.in (as above)
+ * unix/configure.ac (2 LOC Major, 2 LOC minor, 1 LOC patch)
+ * win/configure.ac (as above)
* README (sections 0 and 1)
* macosx/Tk-Common.xcconfig (not patchlevel) 1 LOC
* win/README (not patchlevel)