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/delay2.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/delay2.c')
-rw-r--r-- | pthreads/tests/delay2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pthreads/tests/delay2.c b/pthreads/tests/delay2.c index 8ecaf0b94..071b837f1 100644 --- a/pthreads/tests/delay2.c +++ b/pthreads/tests/delay2.c @@ -58,14 +58,14 @@ func(void * arg) #pragma inline_depth() #endif - return (void *) 1; + return (void *)(size_t)1; } int main(int argc, char * argv[]) { pthread_t t; - int result = 0; + void* result = (void*)0; assert(pthread_mutex_lock(&mx) == 0); @@ -74,8 +74,8 @@ main(int argc, char * argv[]) assert(pthread_mutex_unlock(&mx) == 0); - assert(pthread_join(t, (void **) &result) == 0); - assert(result == (int) PTHREAD_CANCELED); + assert(pthread_join(t, &result) == 0); + assert(result == (void*)PTHREAD_CANCELED); return 0; } |