summaryrefslogtreecommitdiff
path: root/tests/condvar3_2.c
diff options
context:
space:
mode:
authorrpj <rpj>2011-03-05 07:21:12 +0000
committerrpj <rpj>2011-03-05 07:21:12 +0000
commit85dfeaf6133e1b74eefed26cf76c3f8631c7dd1d (patch)
tree92e0f60e66f36f1ea1ca9cec4617d7f187698ecf /tests/condvar3_2.c
parent275d03d3af64e4f5e1769584214f6fccc303456e (diff)
Rework pthread_join result arg casting
Diffstat (limited to 'tests/condvar3_2.c')
-rw-r--r--tests/condvar3_2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/condvar3_2.c b/tests/condvar3_2.c
index 0abe38a..cc21e9f 100644
--- a/tests/condvar3_2.c
+++ b/tests/condvar3_2.c
@@ -127,7 +127,7 @@ main()
{
int i;
pthread_t t[NUMTHREADS + 1];
- int result = 0;
+ void* result = (void*)0;
struct _timeb currSysTime;
const DWORD NANOSEC_PER_MILLISEC = 1000000;
@@ -153,7 +153,7 @@ main()
for (i = 1; i <= NUMTHREADS; i++)
{
assert(pthread_join(t[i], (void *) &result) == 0);
- assert(result == i);
+ assert((int)(size_t)result == i);
/*
* Approximately 2/3rds of the threads are expected to time out.
* Signal the remainder after some threads have woken up and exited