summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2006-08-22 17:45:01 (GMT)
committerandreas_kupries <akupries@shaw.ca>2006-08-22 17:45:01 (GMT)
commitf1e3cf87942d5b9bb16c44f0b105d78e68743de3 (patch)
tree0e8c23557d2161bc7521d17ae7933b2dd94f1633
parentcf3ed398bebbbfd6f95b102ff5cd6e0ba68d8602 (diff)
downloadtcl-f1e3cf87942d5b9bb16c44f0b105d78e68743de3.zip
tcl-f1e3cf87942d5b9bb16c44f0b105d78e68743de3.tar.gz
tcl-f1e3cf87942d5b9bb16c44f0b105d78e68743de3.tar.bz2
* unix/tclUnixNotfy.c (Tcl_WaitForEvent): Fixed broken if syntax
committed 2006-08-21 by Daniel. The broken syntax is visible to all unix platforms, but not on OSX for machines which HAVE_COREFOUNDATION.
-rw-r--r--ChangeLog7
-rw-r--r--unix/tclUnixNotfy.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d9a571..b45f9ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-22 Andreas Kupries <andreask@activestate.com>
+
+ * unix/tclUnixNotfy.c (Tcl_WaitForEvent): Fixed broken if syntax
+ committed 2006-08-21 by Daniel. The broken syntax is visible to
+ all unix platforms, but not on OSX for machines which
+ HAVE_COREFOUNDATION.
+
2006-08-21 Don Porter <dgp@users.sourceforge.net>
* generic/tclIOUtil.c: Revisions to complete the thread finalization
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 118fa79..a2f4642 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.15 2006/08/21 01:08:10 das Exp $
+ * RCS: @(#) $Id: tclUnixNotfy.c,v 1.11.2.16 2006/08/22 17:45:02 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -714,7 +714,7 @@ Tcl_WaitForEvent(timePtr)
Tcl_MutexLock(&notifierMutex);
waitForFiles = (tsdPtr->numFdBits > 0);
- if (timePtr != NULL && timePtr->sec == 0 && timePtr->usec == 0) {
+ if (timePtr != NULL && timePtr->sec == 0 && (timePtr->usec == 0
#if defined(__APPLE__) && defined(__LP64__)
/*
* On 64-bit Darwin, pthread_cond_timedwait() appears to have a bug