diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2005-06-07 10:26:56 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2005-06-07 10:26:56 (GMT) |
commit | a36b4c045ab06380df9b554a4cd8ebfefe9da25d (patch) | |
tree | 4a6b1772bc8307616ffc1d41be754d4e244e85cc /unix/tclUnixNotfy.c | |
parent | 9e2048760ff54bef0c32741a572785bdda40381c (diff) | |
download | tcl-a36b4c045ab06380df9b554a4cd8ebfefe9da25d.zip tcl-a36b4c045ab06380df9b554a4cd8ebfefe9da25d.tar.gz tcl-a36b4c045ab06380df9b554a4cd8ebfefe9da25d.tar.bz2 |
Backport unix threading fix
Diffstat (limited to 'unix/tclUnixNotfy.c')
-rw-r--r-- | unix/tclUnixNotfy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c index 44f8a24..1f1615d 100644 --- a/unix/tclUnixNotfy.c +++ b/unix/tclUnixNotfy.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixNotfy.c,v 1.11.2.11 2005/05/31 08:29:10 vasiljevic Exp $ + * RCS: @(#) $Id: tclUnixNotfy.c,v 1.11.2.12 2005/06/07 10:26:58 dkf Exp $ */ #ifndef HAVE_COREFOUNDATION /* Darwin/Mac OS X CoreFoundation notifier @@ -275,7 +275,7 @@ Tcl_FinalizeNotifier(clientData) */ if (notifierCount == 0) { - int result; + int result, dummy; if (triggerPipe < 0) { panic("Tcl_FinalizeNotifier: notifier pipe not initialized"); } @@ -294,7 +294,7 @@ Tcl_FinalizeNotifier(clientData) close(triggerPipe); Tcl_ConditionWait(¬ifierCV, ¬ifierMutex, NULL); - result = Tcl_JoinThread(notifierThread); + result = Tcl_JoinThread(notifierThread, &dummy); if (result) { Tcl_Panic("Tcl_FinalizeNotifier: unable to join notifier thread"); } |