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/cancel2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/cancel2.c') diff --git a/tests/cancel2.c b/tests/cancel2.c index d738a21..4669a28 100644 --- a/tests/cancel2.c +++ b/tests/cancel2.c @@ -217,17 +217,17 @@ main() for (i = 1; i <= NUMTHREADS; i++) { int fail = 0; - int result = 0; + void* result = (void*)0; assert(pthread_join(t[i], (void *) &result) == 0); - fail = (result != (int) PTHREAD_CANCELED); + fail = ((int)(size_t)result != (int) PTHREAD_CANCELED); if (fail) { fprintf(stderr, "Thread %d: started %d: location %d: cancel type %s\n", i, threadbag[i].started, - result, - ((result % 2) == 0) ? "ASYNCHRONOUS" : "DEFERRED"); + (int)(size_t)result, + (((int)(size_t)result % 2) == 0) ? "ASYNCHRONOUS" : "DEFERRED"); } failed |= fail; } -- cgit v1.2.3