Sun Jan 17 12:01:26 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au>snapshot-1999-01-17

        * private.c (_pthread_sem_timedwait): Move from semaphore.c.
        * semaphore.c : Remove redundant #includes.
        (_pthread_sem_timedwait): Move to private.c.
        (sem_wait): Add missing abstime arg to pthreadCancelableWait() call.
1999-01-17  Ross Johnson  <rpj@ise.canberra.edu.au>
        * runtest: New script to build and run a test in the tests directory.

1 files changed, 1 insertions, 63 deletions

diff --git a/semaphore.c b/semaphore.c
index fc24b1a..9200cdd 100644
--- a/semaphore.c
+++ b/semaphore.c
@@ -35,9 +35,6 @@
  * -------------------------------------------------------------
  */
 #include <pthread.h>
-#include <windows.h>
-#include <process.h>
-#include <errno.h>
 #include <string.h>
 
 #include "semaphore.h"
@@ -215,66 +212,7 @@ sem_wait (sem_t * sem)
 
   return ((sem == NULL)
 	  ? EINVAL
-	  : pthreadCancelableWait (*sem)
-    );
-
-}				/* sem_wait */
-
-
-int
-_pthread_sem_timedwait (sem_t * sem, const struct timespec * abstime)
-     /*
-      * ------------------------------------------------------
-      * DOCPUBLIC
-      *      This function  waits on a semaphore for at most
-      *      'abstime'.
-      *
-      * PARAMETERS
-      *      sem
-      *              pointer to an instance of sem_t
-      *
-      *      abstime
-      *              pointer to an instance of struct timespec
-      *
-      * DESCRIPTION
-      *      This function waits on a semaphore. If the
-      *      semaphore value is greater than zero, it decreases
-      *      its value by one. If the semaphore value is zero, then
-      *      the calling thread (or process) is blocked until it can
-      *      successfully decrease the value or until interrupted by
-      *      a signal.
-      *
-      *      If 'abstime' is a NULL pointer then this function will
-      *      block until it can successfully decrease the value or
-      *      until interrupted by a signal.
-      *
-      * RESULTS
-      *              0               successfully decreased semaphore,
-      *              EINVAL          'sem' is not a valid semaphore,
-      *              ENOSYS          semaphores are not supported,
-      *              EINTR           the function was interrupted by a signal,
-      *              EDEADLK         a deadlock condition was detected.
-      *              ETIMEDOUT       abstime elapsed before success.
-      *
-      * ------------------------------------------------------
-      */
-{
-  DWORD msecs;
-
-  if (abstime == NULL)
-    {
-      msecs = INFINITE;
-    }
-  else
-    {
-      /* Calculate the number of milliseconds in abstime. */
-      msecs = abstime->tv_sec * 1000;
-      msecs += abstime->tv_nsec / 1000000;
-    }
-
-  return ((sem == NULL)
-	  ? EINVAL
-	  : pthreadCancelableWait (*sem, msecs)
+	  : pthreadCancelableWait (*sem, INFINITE)
     );
 
 }				/* sem_wait */