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/exception1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/exception1.c') diff --git a/tests/exception1.c b/tests/exception1.c index 4340078..4ccc24c 100644 --- a/tests/exception1.c +++ b/tests/exception1.c @@ -226,17 +226,17 @@ main() for (i = 0; i < NUMTHREADS; i++) { int fail = 0; - int result = 0; + void* result = (void*)0; /* Canceled thread */ assert(pthread_join(ct[i], (void *) &result) == 0); - assert(!(fail = (result != (int) PTHREAD_CANCELED))); + assert(!(fail = ((int)(size_t)result != (int) PTHREAD_CANCELED))); failed = (failed || fail); /* Exceptioned thread */ assert(pthread_join(et[i], (void *) &result) == 0); - assert(!(fail = (result != ((int) PTHREAD_CANCELED + 2)))); + assert(!(fail = ((int)(size_t)result != ((int) PTHREAD_CANCELED + 2)))); failed = (failed || fail); } -- cgit v1.2.3