summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-01-08 01:08:55 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-01-08 01:08:55 (GMT)
commitd948a43df88ffd2a6228286b9fe2586a609aee7a (patch)
treeb28117c1b677e29535a3801a83f27c1f33d1e806 /Modules
parente4ab5f5531d63023ccd2f99ac5e16945e1d51950 (diff)
downloadcpython-d948a43df88ffd2a6228286b9fe2586a609aee7a.zip
cpython-d948a43df88ffd2a6228286b9fe2586a609aee7a.tar.gz
cpython-d948a43df88ffd2a6228286b9fe2586a609aee7a.tar.bz2
Fix icc warnings: try to set TCL_UNIX_FD for #if TCL_WIN_SOCKET == TCL_UNIX_FD. res is not used, add a XXX comment
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_tkinter.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 48e7ceb..c3015b9 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -98,6 +98,16 @@ Copyright (C) 1994 Steen Lumholt.
#ifdef HAVE_CREATEFILEHANDLER
+/* This bit is to ensure that TCL_UNIX_FD is defined and doesn't interfere
+ with the proper calculation of FHANDLETYPE == TCL_UNIX_FD below. */
+#ifndef TCL_UNIX_FD
+# ifdef TCL_WIN_SOCKET
+# define TCL_UNIX_FD (! TCL_WIN_SOCKET)
+# else
+# define TCL_UNIX_FD 1
+# endif
+#endif
+
/* Tcl_CreateFileHandler() changed several times; these macros deal with the
messiness. In Tcl 8.0 and later, it is not available on Windows (and on
Unix, only because Jack added it back); when available on Windows, it only
@@ -2619,6 +2629,7 @@ Tkapp_TkInit(PyObject *self, PyObject *args)
err = Tcl_Eval(Tkapp_Interp(self), "info exists tk_version");
ENTER_OVERLAP
if (err == TCL_ERROR) {
+ /* XXX: shouldn't we do something with res? */
res = Tkinter_Error(self);
} else {
_tk_exists = Tkapp_Result(self);