diff options
author | rpj <rpj> | 2011-03-05 07:21:12 +0000 |
---|---|---|
committer | rpj <rpj> | 2011-03-05 07:21:12 +0000 |
commit | 85dfeaf6133e1b74eefed26cf76c3f8631c7dd1d (patch) | |
tree | 92e0f60e66f36f1ea1ca9cec4617d7f187698ecf /tests/exception1.c | |
parent | 275d03d3af64e4f5e1769584214f6fccc303456e (diff) |
Rework pthread_join result arg casting
Diffstat (limited to 'tests/exception1.c')
-rw-r--r-- | tests/exception1.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |