diff options
| author | Thomas Pfaff <tpfaff@gmx.net> | 2003-03-27 22:44:41 +0300 |
|---|---|---|
| committer | Thomas Pfaff <tpfaff@gmx.net> | 2003-03-27 22:44:41 +0300 |
| commit | 9b15aa75590869091f7f23822b5e7626e10f7a0c (patch) | |
| tree | fb7bdc6d08fcdb55e505f3b33135f22d6a7de62a /winsup/testsuite | |
| parent | 921587de503cb7b6eb86dac76d09ce994d0bb29d (diff) | |
* winsup.api/pthread/condvar7.c (mythread): Cast
pthread_mutex_unlock argument of pthread_cleanup_push
to void *, preventing a compiler warning / testsuite failure.
* winsup.api/pthread/condvar9.c (mythread): Likewise.
* winsup.api/pthread/rwlock7.c (main): Use ftime instead of
_ftime.
Diffstat (limited to 'winsup/testsuite')
| -rw-r--r-- | winsup/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/testsuite/winsup.api/pthread/condvar7.c | 2 | ||||
| -rw-r--r-- | winsup/testsuite/winsup.api/pthread/condvar9.c | 2 | ||||
| -rw-r--r-- | winsup/testsuite/winsup.api/pthread/rwlock7.c | 4 |
4 files changed, 13 insertions, 4 deletions
diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog index cdec40fb2..290b903e7 100644 --- a/winsup/testsuite/ChangeLog +++ b/winsup/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2003-03-27 Brian Ford <ford@vss.fsi.com> + + * winsup.api/pthread/condvar7.c (mythread): Cast + pthread_mutex_unlock argument of pthread_cleanup_push + to void *, preventing a compiler warning / testsuite failure. + * winsup.api/pthread/condvar9.c (mythread): Likewise. + * winsup.api/pthread/rwlock7.c (main): Use ftime instead of + _ftime. + 2003-03-18 Thomas Pfaff <tpfaff@gmx.net> * winsup.api/pthread/rwlock1.c: New test. diff --git a/winsup/testsuite/winsup.api/pthread/condvar7.c b/winsup/testsuite/winsup.api/pthread/condvar7.c index 9ce94f93d..8e9808f48 100644 --- a/winsup/testsuite/winsup.api/pthread/condvar7.c +++ b/winsup/testsuite/winsup.api/pthread/condvar7.c @@ -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); diff --git a/winsup/testsuite/winsup.api/pthread/condvar9.c b/winsup/testsuite/winsup.api/pthread/condvar9.c index 91a11bd63..04b8d32fa 100644 --- a/winsup/testsuite/winsup.api/pthread/condvar9.c +++ b/winsup/testsuite/winsup.api/pthread/condvar9.c @@ -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); diff --git a/winsup/testsuite/winsup.api/pthread/rwlock7.c b/winsup/testsuite/winsup.api/pthread/rwlock7.c index d8af507b5..5b0727d99 100644 --- a/winsup/testsuite/winsup.api/pthread/rwlock7.c +++ b/winsup/testsuite/winsup.api/pthread/rwlock7.c @@ -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, |