aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/condvar3_1.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-18 10:51:09 +0200
committermarha <marha@users.sourceforge.net>2011-07-18 10:51:09 +0200
commit3c0d2312573b81e3067bea610a58b1940c075e05 (patch)
tree3f025a27d813374f225957801226aa8ee829a33a /pthreads/tests/condvar3_1.c
parentba033884541714680fd7552ab9d6c8817650f7d8 (diff)
parent88101146f2ec7d53ffb793e365f05097ffd35fd3 (diff)
downloadvcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.gz
vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.bz2
vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.zip
Merge remote-tracking branch 'origin/released'
Conflicts: X11/Xfuncproto.h.in X11/configure.ac X11/keysymdef.h freetype/include/freetype/internal/pcftypes.h freetype/src/cache/ftcbasic.c freetype/src/cache/ftccmap.c mesalib/src/glsl/ir.h mesalib/src/glsl/link_functions.cpp mesalib/src/mesa/main/dlist.c mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_program.c pthreads/Makefile
Diffstat (limited to 'pthreads/tests/condvar3_1.c')
-rw-r--r--pthreads/tests/condvar3_1.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/pthreads/tests/condvar3_1.c b/pthreads/tests/condvar3_1.c
index 25a50e4bb..33baeb14d 100644
--- a/pthreads/tests/condvar3_1.c
+++ b/pthreads/tests/condvar3_1.c
@@ -126,8 +126,8 @@ main()
{
int i;
pthread_t t[NUMTHREADS + 1];
- int result = 0;
- struct _timeb currSysTime;
+ void* result = (void*)0;
+ PTW32_STRUCT_TIMEB currSysTime;
const DWORD NANOSEC_PER_MILLISEC = 1000000;
assert(pthread_cond_init(&cv, NULL) == 0);
@@ -137,9 +137,9 @@ main()
assert(pthread_mutex_init(&mutex1, NULL) == 0);
/* get current system time */
- _ftime(&currSysTime);
+ PTW32_FTIME(&currSysTime);
- abstime.tv_sec = currSysTime.time;
+ abstime.tv_sec = (long)currSysTime.time;
abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
abstime.tv_sec += 5;
@@ -148,7 +148,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);
}
do {
@@ -168,8 +168,8 @@ main()
for (i = 1; i <= NUMTHREADS; i++)
{
- assert(pthread_join(t[i], (void **) &result) == 0);
- assert(result == i);
+ assert(pthread_join(t[i], &result) == 0);
+ assert((int)(size_t)result == i);
}
fprintf(stderr, "awk = %d\n", awoken);