aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/cancel7.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/cancel7.c
parent772373ccc8da2b2019555228f4972cc0c5a885a4 (diff)
downloadvcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.gz
vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.bz2
vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.zip
cvs version of pthreads
Diffstat (limited to 'pthreads/tests/cancel7.c')
-rw-r--r--pthreads/tests/cancel7.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/pthreads/tests/cancel7.c b/pthreads/tests/cancel7.c
index 9fb2e6166..5f1390f7b 100644
--- a/pthreads/tests/cancel7.c
+++ b/pthreads/tests/cancel7.c
@@ -63,7 +63,7 @@
*
* Assumptions:
* - have working pthread_create, pthread_self, pthread_mutex_lock/unlock
- * pthread_testcancel, pthread_cancel, pthread_join
+ * pthread_testcancel, pthread_cancel
*
* Pass Criteria:
* - Process returns zero exit status.
@@ -118,7 +118,9 @@ Win32thread(void * arg)
pthread_testcancel();
}
+#if ! defined (__MINGW32__) || defined (__MSVCRT__)
return 0;
+#endif
}
int
@@ -188,13 +190,13 @@ main()
/*
* Can't get a result code.
*/
- result = (int) PTHREAD_CANCELED;
+ result = (int)(size_t)PTHREAD_CANCELED;
#endif
assert(threadbag[i].self.p != NULL);
assert(pthread_kill(threadbag[i].self, 0) == ESRCH);
- fail = (result != (int) PTHREAD_CANCELED);
+ fail = (result != (int)(size_t)PTHREAD_CANCELED);
if (fail)
{