diff options
| author | andreas_kupries <akupries@shaw.ca> | 2008-12-02 18:23:51 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2008-12-02 18:23:51 (GMT) |
| commit | 367a0d1f43cd0fd0273c65d8398d77926f811239 (patch) | |
| tree | b427ff90060934eb1d33d2054c22822cfce5c257 | |
| parent | 7d7e6c17a1d6a68a6ca89923164fa69be4244f6e (diff) | |
| download | tcl-367a0d1f43cd0fd0273c65d8398d77926f811239.zip tcl-367a0d1f43cd0fd0273c65d8398d77926f811239.tar.gz tcl-367a0d1f43cd0fd0273c65d8398d77926f811239.tar.bz2 | |
* generic/tclIO.c (TclFinalizeIOSubsystem): Replaced Alexandre
Ferrieux's first patch for [Bug 2270477] with a gentler version,
also supplied by him.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tclIO.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2008-12-02 Andreas Kupries <andreask@activestate.com> + + * generic/tclIO.c (TclFinalizeIOSubsystem): Replaced Alexandre + Ferrieux's first patch for [Bug 2270477] with a gentler version, + also supplied by him. + 2008-12-01 Don Porter <dgp@users.sourceforge.net> * generic/tclParse.c: Backport fix for [Bug 2251175]. diff --git a/generic/tclIO.c b/generic/tclIO.c index 96659e8..2e8b7dc 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.137.2.8 2008/11/25 22:16:03 andreas_kupries Exp $ + * RCS: @(#) $Id: tclIO.c,v 1.137.2.9 2008/12/02 18:23:51 andreas_kupries Exp $ */ #include "tclInt.h" @@ -299,7 +299,7 @@ TclFinalizeIOSubsystem(void) statePtr != NULL; statePtr = statePtr->nextCSPtr) { chanPtr = statePtr->topChanPtr; - if (!(statePtr->flags & CHANNEL_DEAD)) { + if (!(statePtr->flags & (CHANNEL_INCLOSE|CHANNEL_CLOSED|CHANNEL_DEAD))) { active = 1; break; } @@ -364,8 +364,8 @@ TclFinalizeIOSubsystem(void) */ chanPtr->instanceData = NULL; + SetFlag(statePtr, CHANNEL_DEAD); } - SetFlag(statePtr, CHANNEL_DEAD); } } |