Fri Jan 15 15:41:28 1999 Ross Johnson <rpj@swan.canberra.edu.au>

	* pthread.h: Add new 'abstime' arg to pthreadCancelableWait()
	prototype.
	* condvar.c (cond_timedwait): New generalised function called by
	both pthread_cond_wait() and pthread_cond_timedwait(). This is
	essentially pthread_cond_wait() renamed and modified to add the
	'abstime' arg and call the new _pthread_sem_timedwait() instead of
	sem_wait().
	(pthread_cond_wait): Now just calls the internal static
	function cond_timedwait() with an INFINITE wait.
	(pthread_cond_timedwait): Now implemented. Calls the internal
	static function cond_timedwait().
	* implement.h (_pthread_sem_timedwait): New internal function
	prototype.
	* misc.c (pthreadCancelableWait): Added new 'abstime' argument
	to allow shorter than INFINITE wait.
	* semaphore.c (_pthread_sem_timedwait): New function for internal
	use.  This is essentially sem_wait() modified to add the
        'abstime' arg and call the modified (see above)
        pthreadCancelableWait().

1 files changed, 3 insertions, 2 deletions

diff --git a/pthread.h b/pthread.h
index 455cf19..861a0e8 100644
--- a/pthread.h
+++ b/pthread.h
@@ -918,9 +918,10 @@ int pthread_attr_setschedparam (pthread_attr_t *attr,
  *              WaitForMultipleObjects
  *
  * on 'waitHandle' and a manually reset WIN32 Event
- * used to implement pthread_cancel.
+ * used to implement pthread_cancel. The 'abstime'
+ * argument is simply passed to WaitForMultipleObjects.
  */
-int pthreadCancelableWait (HANDLE waitHandle);
+int pthreadCancelableWait (HANDLE waitHandle, DWORD abstime);
 
 /*
  * Thread-Safe C Runtime Library Mappings