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/cancel6d.c | |
parent | 85dfeaf6133e1b74eefed26cf76c3f8631c7dd1d (diff) |
64 bit compatibility (mingw64)
Diffstat (limited to 'tests/cancel6d.c')
-rw-r--r-- | tests/cancel6d.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/cancel6d.c b/tests/cancel6d.c index e22a3c5..3fd296a 100644 --- a/tests/cancel6d.c +++ b/tests/cancel6d.c @@ -86,7 +86,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]); @@ -109,7 +109,7 @@ mythread(void * arg) pthread_testcancel(); } - return (void *) (size_t)result; + return result; } int @@ -125,7 +125,7 @@ main() { threadbag[i].started = 0; threadbag[i].threadnum = i; - assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0); + assert(pthread_create(&t[i], NULL, mythread, (void *)(size_t) &threadbag[i]) == 0); } /* @@ -167,9 +167,9 @@ main() int fail = 0; void* result = (void*)0; - 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) { |