Skip to content

Commit 8d199d4

Browse files
Michiel Jan Laurens de HoonMichiel Jan Laurens de Hoon
authored andcommitted
don't check for thread support on Tcl 9.x, as it is always threaded and the tcl_platform(threaded) variable has been removed
1 parent 53a3669 commit 8d199d4

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

‎Modules/_tkinter.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ _get_tcl_lib_path(void)
180180
}
181181
#endif /* MS_WINDOWS */
182182

183-
<<<<<<< HEAD
184183
#if defined(MS_WINDOWS) && TK_MAJOR_VERSION >= 9
185184
static void
186185
mount_tk_dll_zip(void)
@@ -284,6 +283,7 @@ Tkinter_TkInit(Tcl_Interp *interp)
284283
285284
*/
286285

286+
#if TCL_MAJOR_VERSION < 9 /* Tcl 9.x is always threaded */
287287
static int
288288
_check_tcl_threaded(void)
289289
{
@@ -298,6 +298,7 @@ _check_tcl_threaded(void)
298298
if (threaded == NULL) return 0;
299299
else return 1;
300300
}
301+
#endif
301302

302303
static Tcl_ThreadDataKey state_key;
303304
#define tcl_tstate \
@@ -3752,10 +3753,6 @@ PyInit__tkinter(void)
37523753

37533754
PyObject *m, *uexe, *cexe;
37543755

3755-
tcl_lock = PyThread_allocate_lock();
3756-
if (tcl_lock == NULL)
3757-
return PyErr_NoMemory();
3758-
37593756
m = PyModule_Create(&_tkintermodule);
37603757
if (m == NULL)
37613758
return NULL;

0 commit comments

Comments
 (0)