summaryrefslogtreecommitdiff
path: root/tests/cancel2.c
diff options
context:
space:
mode:
authorrpj <rpj>2011-03-05 07:21:12 +0000
committerrpj <rpj>2011-03-05 07:21:12 +0000
commit85dfeaf6133e1b74eefed26cf76c3f8631c7dd1d (patch)
tree92e0f60e66f36f1ea1ca9cec4617d7f187698ecf /tests/cancel2.c
parent275d03d3af64e4f5e1769584214f6fccc303456e (diff)
Rework pthread_join result arg casting
Diffstat (limited to 'tests/cancel2.c')
-rw-r--r--tests/cancel2.c8
1 files changed, 4 insertions, 4 deletions
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;
}