Backport unix threading fix

2 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index bf416c5..dec2092 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-07  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
+
+	* unix/tclUnixNotfy.c (Tcl_FinalizeNotifier): Add dummy variable
+	so threaded build compiles.
+
 2005-06-06  Kevin B. Kenny  <kennykb@acm.org>
 
 	* win/tclWin32Dll.c: Corrected another buglet in the assembly
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(&notifierCV, &notifierMutex, NULL);
-	result = Tcl_JoinThread(notifierThread);
+	result = Tcl_JoinThread(notifierThread, &dummy);
 	if (result) {
 	    Tcl_Panic("Tcl_FinalizeNotifier: unable to join notifier thread");
 	}