summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-04-22 07:59:32 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-04-22 07:59:32 (GMT)
commit71b49dde3a1162248e43ff99f4e83aae07747341 (patch)
treef520f6951c08c923eac024b961755be1fbbcc7b0 /Modules
parentaec050919344b9272f260b6275523cfb3abd1e41 (diff)
parent3af7a38c616869b1d195add43b43e8af118e6a31 (diff)
downloadcpython-71b49dde3a1162248e43ff99f4e83aae07747341.zip
cpython-71b49dde3a1162248e43ff99f4e83aae07747341.tar.gz
cpython-71b49dde3a1162248e43ff99f4e83aae07747341.tar.bz2
Issue #16840. Turn off bignum support in tkinter with with Tcl earlier than 8.5.8
(tclTomMath.h was broken) and non-final Tcl 8.6. Removed TK_VERSION_HEX.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_tkinter.c7
-rw-r--r--Modules/tkinter.h16
2 files changed, 12 insertions, 11 deletions
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 3f58353..4d61bb2 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -52,11 +52,12 @@ Copyright (C) 1994 Steen Lumholt.
#include "tkinter.h"
-#if TK_VERSION_HEX < 0x08040002
+#if TK_HEX_VERSION < 0x08040200
#error "Tk older than 8.4 not supported"
#endif
-#if TK_VERSION_HEX >= 0x08050002
+#if TK_HEX_VERSION >= 0x08050208 && TK_HEX_VERSION < 0x08060000 || \
+ TK_HEX_VERSION >= 0x08060200
#define HAVE_LIBTOMMAMTH
#include <tclTomMath.h>
#endif
@@ -1227,7 +1228,7 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
Tcl_GetCharLength(value));
}
-#if TK_VERSION_HEX >= 0x08050000
+#if TK_HEX_VERSION >= 0x08050000
if (app->BooleanType == NULL &&
strcmp(value->typePtr->name, "booleanString") == 0) {
/* booleanString type is not registered in Tcl */
diff --git a/Modules/tkinter.h b/Modules/tkinter.h
index f7e50cd..cb5a806 100644
--- a/Modules/tkinter.h
+++ b/Modules/tkinter.h
@@ -4,24 +4,24 @@
/* This header is used to share some macros between _tkinter.c and
* tkappinit.c.
* Be sure to include tk.h before including this header so
- * TK_VERSION_HEX is properly defined. */
+ * TK_HEX_VERSION is properly defined. */
/* TK_RELEASE_LEVEL is always one of the following:
- * TCL_ALPHA_RELEASE 0
+ * TCL_ALPHA_RELEASE 0
* TCL_BETA_RELEASE 1
* TCL_FINAL_RELEASE 2
*/
-#define TK_VERSION_HEX ((TK_MAJOR_VERSION << 24) | \
- (TK_MINOR_VERSION << 16) | \
- (TK_RELEASE_SERIAL << 8) | \
- (TK_RELEASE_LEVEL << 0))
+#define TK_HEX_VERSION ((TK_MAJOR_VERSION << 24) | \
+ (TK_MINOR_VERSION << 16) | \
+ (TK_RELEASE_LEVEL << 8) | \
+ (TK_RELEASE_SERIAL << 0))
/* Protect Tk 8.4.13 and older from a deadlock that happens when trying
* to load tk after a failed attempt. */
-#if TK_VERSION_HEX < 0x08040e02
+#if TK_HEX_VERSION < 0x0804020e
#define TKINTER_PROTECT_LOADTK
#define TKINTER_LOADTK_ERRMSG \
- "Calling Tk_Init again after a previous call failed might deadlock"
+ "Calling Tk_Init again after a previous call failed might deadlock"
#endif
#endif /* !TKINTER_H */