Index: winsup.api/pthread/condvar7.c
===================================================================
RCS file: /cvs/src/src/winsup/testsuite/winsup.api/pthread/condvar7.c,v
retrieving revision 1.1
diff -u -p -r1.1 condvar7.c
--- winsup.api/pthread/condvar7.c	18 Mar 2003 19:51:58 -0000	1.1
+++ winsup.api/pthread/condvar7.c	26 Mar 2003 21:45:47 -0000
@@ -97,7 +97,7 @@ mythread(void * arg)
 #ifdef _MSC_VER
 #pragma inline_depth(0)
 #endif
-  pthread_cleanup_push(pthread_mutex_unlock, (void *) &cvthing.lock);
+  pthread_cleanup_push((void *) pthread_mutex_unlock, (void *) &cvthing.lock);
 
   while (! (cvthing.shared > 0))
     assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
Index: winsup.api/pthread/condvar9.c
===================================================================
RCS file: /cvs/src/src/winsup/testsuite/winsup.api/pthread/condvar9.c,v
retrieving revision 1.1
diff -u -p -r1.1 condvar9.c
--- winsup.api/pthread/condvar9.c	18 Mar 2003 19:51:58 -0000	1.1
+++ winsup.api/pthread/condvar9.c	26 Mar 2003 21:45:47 -0000
@@ -102,7 +102,7 @@ mythread(void * arg)
 #ifdef _MSC_VER
 #pragma inline_depth(0)
 #endif
-  pthread_cleanup_push(pthread_mutex_unlock, (void *) &cvthing.lock);
+  pthread_cleanup_push((void *) pthread_mutex_unlock, (void *) &cvthing.lock);
 
   while (! (cvthing.shared > 0))
     assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
Index: winsup.api/pthread/rwlock7.c
===================================================================
RCS file: /cvs/src/src/winsup/testsuite/winsup.api/pthread/rwlock7.c,v
retrieving revision 1.1
diff -u -p -r1.1 rwlock7.c
--- winsup.api/pthread/rwlock7.c	18 Mar 2003 20:04:24 -0000	1.1
+++ winsup.api/pthread/rwlock7.c	26 Mar 2003 21:45:47 -0000
@@ -131,7 +131,7 @@ main (int argc, char *argv[])
       assert(pthread_rwlock_init (&data[data_count].lock, NULL) == 0);
     }
 
-  _ftime(&currSysTime1);
+  ftime(&currSysTime1);
 
   /*
    * Create THREADS threads to access shared data.
@@ -177,7 +177,7 @@ main (int argc, char *argv[])
   printf ("%d thread updates, %d data updates\n",
           thread_updates, data_updates);
 
-  _ftime(&currSysTime2);
+  ftime(&currSysTime2);
 
   printf( "\nstart: %ld/%d, stop: %ld/%d, duration:%ld\n",
           currSysTime1.time,currSysTime1.millitm,