aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/cancel4.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-18 10:33:05 +0200
committermarha <marha@users.sourceforge.net>2011-07-18 10:33:05 +0200
commit88101146f2ec7d53ffb793e365f05097ffd35fd3 (patch)
treedb77eef572a00c62c8d9485c4786f682e20a2fd0 /pthreads/tests/cancel4.c
parent772373ccc8da2b2019555228f4972cc0c5a885a4 (diff)
downloadvcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.gz
vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.bz2
vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.zip
cvs version of pthreads
Diffstat (limited to 'pthreads/tests/cancel4.c')
-rw-r--r--pthreads/tests/cancel4.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/pthreads/tests/cancel4.c b/pthreads/tests/cancel4.c
index 6d6d3dc7b..893f33b12 100644
--- a/pthreads/tests/cancel4.c
+++ b/pthreads/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 *) result;
+ return result;
}
int
@@ -173,16 +173,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 indicates that async
* cancelation occurred.
*/
- 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)
{