aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/cleanup1.c
diff options
context:
space:
mode:
Diffstat (limited to 'pthreads/tests/cleanup1.c')
-rw-r--r--pthreads/tests/cleanup1.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/pthreads/tests/cleanup1.c b/pthreads/tests/cleanup1.c
index 385aed959..30d4940b7 100644
--- a/pthreads/tests/cleanup1.c
+++ b/pthreads/tests/cleanup1.c
@@ -146,7 +146,7 @@ mythread(void * arg)
#pragma inline_depth()
#endif
- return (void *) result;
+ return (void *) (size_t)result;
}
int
@@ -203,18 +203,18 @@ 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);
+ assert(pthread_join(t[i], &result) == 0);
- fail = (result != (int) PTHREAD_CANCELED);
+ fail = ((int)(size_t)result != (int) PTHREAD_CANCELED);
if (fail)
{
fprintf(stderr, "Thread %d: started %d: result %d\n",
i,
threadbag[i].started,
- result);
+ (int)(size_t)result);
}
failed = (failed || fail);
}