Merge trunk.

Add Gustaf's latest fix for unit-tests.

1 files changed, 12 insertions, 1 deletions

diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 0493ee4..693eeac 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -1032,7 +1032,18 @@ Tcl_WaitForEvent(
 		pthread_mutex_lock(&notifierMutex);
 	    }
 #else
-	    pthread_cond_wait(&tsdPtr->waitCV, &notifierMutex);
+	    if (timePtr != NULL) {
+	       Tcl_Time now;
+	       struct timespec ptime;
+
+	       Tcl_GetTime(&now);
+	       ptime.tv_sec = timePtr->sec + now.sec + (timePtr->usec + now.usec) / 1000000;
+	       ptime.tv_nsec = 1000 * ((timePtr->usec + now.usec) % 1000000);
+
+	       pthread_cond_timedwait(&tsdPtr->waitCV, &notifierMutex, &ptime);
+	    } else {
+	       pthread_cond_wait(&tsdPtr->waitCV, &notifierMutex);
+	    }
 #endif /* __CYGWIN__ */
 	}
 	tsdPtr->eventReady = 0;