diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-18 10:33:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-18 10:33:05 +0200 |
| commit | 88101146f2ec7d53ffb793e365f05097ffd35fd3 (patch) | |
| tree | db77eef572a00c62c8d9485c4786f682e20a2fd0 /pthreads/tests/cancel6a.c | |
| parent | 772373ccc8da2b2019555228f4972cc0c5a885a4 (diff) | |
| download | vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.gz vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.bz2 vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.zip | |
cvs version of pthreads
Diffstat (limited to 'pthreads/tests/cancel6a.c')
| -rw-r--r-- | pthreads/tests/cancel6a.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pthreads/tests/cancel6a.c b/pthreads/tests/cancel6a.c index 644cd4a53..58063d573 100644 --- a/pthreads/tests/cancel6a.c +++ b/pthreads/tests/cancel6a.c @@ -85,7 +85,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]); @@ -105,7 +105,7 @@ mythread(void * arg) for (bag->count = 0; bag->count < 100; bag->count++) Sleep(100); - return (void *) result; + return result; } int @@ -161,16 +161,16 @@ main() for (i = 1; i <= NUMTHREADS; i++) { int fail = 0; - int result = 0; + void* result = (void*)0; /* * The thread does not contain any cancelation points, so * a return value of PTHREAD_CANCELED confirms that async * cancelation succeeded. */ - assert(pthread_join(t[i], (void **) &result) == 0); + assert(pthread_join(t[i], &result) == 0); - fail = (result != (int) PTHREAD_CANCELED); + fail = (result != PTHREAD_CANCELED); if (fail) { |