summaryrefslogtreecommitdiff
path: root/tests/condvar2_1.c
diff options
context:
space:
mode:
authorrpj <rpj>2011-03-06 10:46:44 +0000
committerrpj <rpj>2011-03-06 10:46:44 +0000
commit1183e5acfa10c7bda1dc39034d6e2fa6dec6016f (patch)
treefd5220ed96e0fef2390b72ad170b62f0516242ce /tests/condvar2_1.c
parent85dfeaf6133e1b74eefed26cf76c3f8631c7dd1d (diff)
64 bit compatibility (mingw64)
Diffstat (limited to 'tests/condvar2_1.c')
-rw-r--r--tests/condvar2_1.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/condvar2_1.c b/tests/condvar2_1.c
index 2cc563a..7d938f8 100644
--- a/tests/condvar2_1.c
+++ b/tests/condvar2_1.c
@@ -106,7 +106,11 @@ main()
int i;
pthread_t t[NUMTHREADS + 1];
void* result = (void*)0;
+#if (defined(__MINGW64__) || defined(__MINGW32__)) && __MSVCRT_VERSION__ >= 0x0601
+ struct __timeb64 currSysTime;
+#else
struct _timeb currSysTime;
+#endif
const DWORD NANOSEC_PER_MILLISEC = 1000000;
assert(pthread_cond_init(&cv, NULL) == 0);
@@ -125,7 +129,7 @@ main()
for (i = 1; i <= NUMTHREADS; i++)
{
- assert(pthread_create(&t[i], NULL, mythread, (void *) i) == 0);
+ assert(pthread_create(&t[i], NULL, mythread, (void *)(size_t)i) == 0);
}
assert(pthread_mutex_unlock(&mutex) == 0);