aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/rwlock6_t.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-18 10:33:05 +0200
committermarha <marha@users.sourceforge.net>2011-07-18 10:33:05 +0200
commit88101146f2ec7d53ffb793e365f05097ffd35fd3 (patch)
treedb77eef572a00c62c8d9485c4786f682e20a2fd0 /pthreads/tests/rwlock6_t.c
parent772373ccc8da2b2019555228f4972cc0c5a885a4 (diff)
downloadvcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.gz
vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.bz2
vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.zip
cvs version of pthreads
Diffstat (limited to 'pthreads/tests/rwlock6_t.c')
-rw-r--r--pthreads/tests/rwlock6_t.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/pthreads/tests/rwlock6_t.c b/pthreads/tests/rwlock6_t.c
index aa38bf564..71cbe220a 100644
--- a/pthreads/tests/rwlock6_t.c
+++ b/pthreads/tests/rwlock6_t.c
@@ -55,29 +55,29 @@ void * wrfunc(void * arg)
bankAccount += 10;
assert(pthread_rwlock_unlock(&rwlock1) == 0);
- return ((void *) bankAccount);
+ return ((void *)(size_t)bankAccount);
}
void * rdfunc(void * arg)
{
int ba = -1;
struct timespec abstime = { 0, 0 };
- struct _timeb currSysTime;
+ PTW32_STRUCT_TIMEB currSysTime;
const DWORD NANOSEC_PER_MILLISEC = 1000000;
- _ftime(&currSysTime);
+ PTW32_FTIME(&currSysTime);
- abstime.tv_sec = currSysTime.time;
+ abstime.tv_sec = (long)currSysTime.time;
abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
- if ((int) arg == 1)
+ if ((int) (size_t)arg == 1)
{
abstime.tv_sec += 1;
assert(pthread_rwlock_timedrdlock(&rwlock1, &abstime) == ETIMEDOUT);
ba = 0;
}
- else if ((int) arg == 2)
+ else if ((int) (size_t)arg == 2)
{
abstime.tv_sec += 3;
assert(pthread_rwlock_timedrdlock(&rwlock1, &abstime) == 0);
@@ -85,7 +85,7 @@ void * rdfunc(void * arg)
assert(pthread_rwlock_unlock(&rwlock1) == 0);
}
- return ((void *) ba);
+ return ((void *)(size_t)ba);
}
int
@@ -95,30 +95,30 @@ main()
pthread_t wrt2;
pthread_t rdt1;
pthread_t rdt2;
- int wr1Result = 0;
- int wr2Result = 0;
- int rd1Result = 0;
- int rd2Result = 0;
+ void* wr1Result = (void*)0;
+ void* wr2Result = (void*)0;
+ void* rd1Result = (void*)0;
+ void* rd2Result = (void*)0;
bankAccount = 0;
assert(pthread_create(&wrt1, NULL, wrfunc, NULL) == 0);
Sleep(500);
- assert(pthread_create(&rdt1, NULL, rdfunc, (void *) 1) == 0);
+ assert(pthread_create(&rdt1, NULL, rdfunc, (void *)(size_t)1) == 0);
Sleep(500);
assert(pthread_create(&wrt2, NULL, wrfunc, NULL) == 0);
Sleep(500);
- assert(pthread_create(&rdt2, NULL, rdfunc, (void *) 2) == 0);
+ assert(pthread_create(&rdt2, NULL, rdfunc, (void *)(size_t)2) == 0);
- assert(pthread_join(wrt1, (void **) &wr1Result) == 0);
- assert(pthread_join(rdt1, (void **) &rd1Result) == 0);
- assert(pthread_join(wrt2, (void **) &wr2Result) == 0);
- assert(pthread_join(rdt2, (void **) &rd2Result) == 0);
+ assert(pthread_join(wrt1, &wr1Result) == 0);
+ assert(pthread_join(rdt1, &rd1Result) == 0);
+ assert(pthread_join(wrt2, &wr2Result) == 0);
+ assert(pthread_join(rdt2, &rd2Result) == 0);
- assert(wr1Result == 10);
- assert(rd1Result == 0);
- assert(wr2Result == 20);
- assert(rd2Result == 20);
+ assert((int)(size_t)wr1Result == 10);
+ assert((int)(size_t)rd1Result == 0);
+ assert((int)(size_t)wr2Result == 20);
+ assert((int)(size_t)rd2Result == 20);
return 0;
}