diff options
author | mdejong <mdejong@noemail.net> | 2002-11-07 02:13:35 (GMT) |
---|---|---|
committer | mdejong <mdejong@noemail.net> | 2002-11-07 02:13:35 (GMT) |
commit | 5eaa499a632bc6ecd456ac1faa409fdef624e070 (patch) | |
tree | f86db515375673b4202dbd6719d7bd881da96117 /unix/tclUnixChan.c | |
parent | fdd7933bc7031a5752f663bb798bce3332d4444f (diff) | |
download | tcl-5eaa499a632bc6ecd456ac1faa409fdef624e070.zip tcl-5eaa499a632bc6ecd456ac1faa409fdef624e070.tar.gz tcl-5eaa499a632bc6ecd456ac1faa409fdef624e070.tar.bz2 |
* generic/tclEvent.c (TclInExit, TclInThreadExit):
Split out functionality of TclInExit to make it
clear which one should be called in each situation.
* generic/tclInt.decls: Declare TclInThreadExit.
* generic/tclIntDecls.h: Regen.
* generic/tclStubInit.c: Regen.
* mac/tclMacChan.c (StdIOClose):
* unix/tclUnixChan.c (FileCloseProc):
* win/tclWinChan.c (FileCloseProc):
* win/tclWinConsole.c (ConsoleCloseProc):
* win/tclWinPipe.c (TclpCloseFile):
* win/tclWinSerial.c (SerialCloseProc): Invoke the
new TclInThreadExit method instead of TclInExit.
FossilOrigin-Name: de2cfbf168c353f2de6ec6db06bfb347b0ce9640
Diffstat (limited to 'unix/tclUnixChan.c')
-rw-r--r-- | unix/tclUnixChan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index ef4ac89..4838c55 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.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: tclUnixChan.c,v 1.39 2002/09/03 02:01:25 hobbs Exp $ + * RCS: @(#) $Id: tclUnixChan.c,v 1.40 2002/11/07 02:13:37 mdejong Exp $ */ #include "tclInt.h" /* Internal definitions for Tcl. */ @@ -549,7 +549,7 @@ FileCloseProc(instanceData, interp) * Do not close standard channels while in thread-exit. */ - if (!TclInExit() + if (!TclInThreadExit() || ((fsPtr->fd != 0) && (fsPtr->fd != 1) && (fsPtr->fd != 2))) { if (close(fsPtr->fd) < 0) { errorCode = errno; |