aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/condvar2_1.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/condvar2_1.c
parent772373ccc8da2b2019555228f4972cc0c5a885a4 (diff)
downloadvcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.gz
vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.bz2
vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.zip
cvs version of pthreads
Diffstat (limited to 'pthreads/tests/condvar2_1.c')
-rw-r--r--pthreads/tests/condvar2_1.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/pthreads/tests/condvar2_1.c b/pthreads/tests/condvar2_1.c
index 92dddfd9a..3486d2110 100644
--- a/pthreads/tests/condvar2_1.c
+++ b/pthreads/tests/condvar2_1.c
@@ -105,8 +105,8 @@ main()
{
int i;
pthread_t t[NUMTHREADS + 1];
- int result = 0;
- struct _timeb currSysTime;
+ void* result = (void*)0;
+ PTW32_STRUCT_TIMEB currSysTime;
const DWORD NANOSEC_PER_MILLISEC = 1000000;
assert(pthread_cond_init(&cv, NULL) == 0);
@@ -114,9 +114,9 @@ main()
assert(pthread_mutex_init(&mutex, NULL) == 0);
/* get current system time */
- _ftime(&currSysTime);
+ PTW32_FTIME(&currSysTime);
- abstime.tv_sec = currSysTime.time;
+ abstime.tv_sec = (long)currSysTime.time;
abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
abstime.tv_sec += 5;
@@ -125,15 +125,15 @@ main()
for (i = 1; i <= NUMTHREADS; i++)
{
- assert(pthread_create(&t[i], NULL, mythread, (void *) i) == 0);
+ assert(pthread_create(&t[i], NULL, mythread, (void *)(size_t)i) == 0);
}
assert(pthread_mutex_unlock(&mutex) == 0);
for (i = 1; i <= NUMTHREADS; i++)
{
- assert(pthread_join(t[i], (void **) &result) == 0);
- assert(result == i);
+ assert(pthread_join(t[i], &result) == 0);
+ assert((int)(size_t)result == i);
}
{