From 85dfeaf6133e1b74eefed26cf76c3f8631c7dd1d Mon Sep 17 00:00:00 2001 From: rpj Date: Sat, 5 Mar 2011 07:21:12 +0000 Subject: Rework pthread_join result arg casting --- tests/condvar3_2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/condvar3_2.c') diff --git a/tests/condvar3_2.c b/tests/condvar3_2.c index 0abe38a..cc21e9f 100644 --- a/tests/condvar3_2.c +++ b/tests/condvar3_2.c @@ -127,7 +127,7 @@ main() { int i; pthread_t t[NUMTHREADS + 1]; - int result = 0; + void* result = (void*)0; struct _timeb currSysTime; const DWORD NANOSEC_PER_MILLISEC = 1000000; @@ -153,7 +153,7 @@ main() for (i = 1; i <= NUMTHREADS; i++) { assert(pthread_join(t[i], (void *) &result) == 0); - assert(result == i); + assert((int)(size_t)result == i); /* * Approximately 2/3rds of the threads are expected to time out. * Signal the remainder after some threads have woken up and exited -- cgit v1.2.3