summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvasiljevic <zv@archiware.com>2005-10-13 20:51:53 (GMT)
committervasiljevic <zv@archiware.com>2005-10-13 20:51:53 (GMT)
commit89498d835feae1f8b22d96e833305cbb9d1399a0 (patch)
tree1890b7c4acec2076184cd678c46393e1647f373c
parent2d61252dbbde85b1896417dfaa3c2e96e54f2101 (diff)
downloadtcl-89498d835feae1f8b22d96e833305cbb9d1399a0.zip
tcl-89498d835feae1f8b22d96e833305cbb9d1399a0.tar.gz
tcl-89498d835feae1f8b22d96e833305cbb9d1399a0.tar.bz2
Temporary ifdef TCL_THREADS changes done to de-activate pending
event processing when channel is being closed/cutted.
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclIO.c9
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c5ea12c..4f1dc13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-13 Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
+
+ * generic/tclIO.c (Tcl_ClearChannelHandlers): temporary
+ ifdef TCL_THREADS changes done to de-activate pending
+ event processing when channel is being closed/cutted.
+
2005-10-13 Don Porter <dgp@users.sourceforge.net>
* generic/tclExecute.c: Removed obsolete use of NO_ERRNO_H.
diff --git a/generic/tclIO.c b/generic/tclIO.c
index fe6dc24..8adc8db 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIO.c,v 1.95 2005/10/04 18:32:47 vasiljevic Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.96 2005/10/13 20:51:53 vasiljevic Exp $
*/
#include "tclInt.h"
@@ -2930,7 +2930,14 @@ Tcl_ClearChannelHandlers(channel)
*/
statePtr->interestMask = 0;
+
+ /*
+ * TEMPORARILY DEFINED FOR THREADED BUILD ONLY. SEE SF BUG# 1323992
+ */
+
+#ifdef TCL_THREADS
(chanPtr->typePtr->watchProc)(chanPtr->instanceData, 0);
+#endif
/*
* Remove any EventScript records for this channel.