summaryrefslogtreecommitdiffstats
path: root/Modules/_tkinter.c
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/_tkinter.c
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/_tkinter.c')
-rw-r--r--Modules/_tkinter.c7
1 files changed, 4 insertions, 3 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 */