diff options
author | rpj <rpj> | 2011-03-06 10:46:44 +0000 |
---|---|---|
committer | rpj <rpj> | 2011-03-06 10:46:44 +0000 |
commit | 1183e5acfa10c7bda1dc39034d6e2fa6dec6016f (patch) | |
tree | fd5220ed96e0fef2390b72ad170b62f0516242ce /tests/cancel4.c | |
parent | 85dfeaf6133e1b74eefed26cf76c3f8631c7dd1d (diff) |
64 bit compatibility (mingw64)
Diffstat (limited to 'tests/cancel4.c')
-rw-r--r-- | tests/cancel4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/cancel4.c b/tests/cancel4.c index 28c5d2e..893f33b 100644 --- a/tests/cancel4.c +++ b/tests/cancel4.c @@ -98,7 +98,7 @@ static bag_t threadbag[NUMTHREADS + 1]; void * mythread(void * arg) { - int result = ((int)PTHREAD_CANCELED + 1); + void* result = (void*)((int)(size_t)PTHREAD_CANCELED + 1); bag_t * bag = (bag_t *) arg; assert(bag == &threadbag[bag->threadnum]); @@ -118,7 +118,7 @@ mythread(void * arg) for (bag->count = 0; bag->count < 20; bag->count++) Sleep(100); - return (void *) (size_t)result; + return result; } int @@ -180,9 +180,9 @@ main() * a return value of PTHREAD_CANCELED indicates that async * cancelation occurred. */ - assert(pthread_join(t[i], (void *) &result) == 0); + assert(pthread_join(t[i], &result) == 0); - fail = ((int)(size_t)result == (int) PTHREAD_CANCELED); + fail = (result == PTHREAD_CANCELED); if (fail) { |