summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--unix/tclUnixNotfy.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 46a7198..9ea2b3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-01 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+
+ * unix/tclUnixNotfy.c (Tcl_FinalizeNotifier): Pass the correct
+ number of arguments to Tcl_JoinThread.
+
2005-05-31 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* unix/configure.in, unix/tcl.m4: Standardize generation of help
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index bd4f68f..1976433 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.25 2005/05/31 11:37:46 vasiljevic Exp $
+ * RCS: @(#) $Id: tclUnixNotfy.c,v 1.26 2005/06/01 09:38:05 dkf Exp $
*/
#ifndef HAVE_COREFOUNDATION /* Darwin/Mac OS X CoreFoundation notifier
@@ -273,7 +273,7 @@ Tcl_FinalizeNotifier(clientData)
*/
if (notifierCount == 0) {
- int result;
+ int result, ignored;
if (triggerPipe < 0) {
Tcl_Panic("Tcl_FinalizeNotifier: notifier pipe not initialized");
}
@@ -292,7 +292,7 @@ Tcl_FinalizeNotifier(clientData)
close(triggerPipe);
Tcl_ConditionWait(&notifierCV, &notifierMutex, NULL);
- result = Tcl_JoinThread(notifierThread);
+ result = Tcl_JoinThread(notifierThread, &ignored);
if (result) {
Tcl_Panic("Tcl_FinalizeNotifier: unable to join notifier thread");
}