aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/delay2.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/delay2.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/delay2.c')
-rw-r--r--pthreads/tests/delay2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pthreads/tests/delay2.c b/pthreads/tests/delay2.c
index 8ecaf0b94..071b837f1 100644
--- a/pthreads/tests/delay2.c
+++ b/pthreads/tests/delay2.c
@@ -58,14 +58,14 @@ func(void * arg)
#pragma inline_depth()
#endif
- return (void *) 1;
+ return (void *)(size_t)1;
}
int
main(int argc, char * argv[])
{
pthread_t t;
- int result = 0;
+ void* result = (void*)0;
assert(pthread_mutex_lock(&mx) == 0);
@@ -74,8 +74,8 @@ main(int argc, char * argv[])
assert(pthread_mutex_unlock(&mx) == 0);
- assert(pthread_join(t, (void **) &result) == 0);
- assert(result == (int) PTHREAD_CANCELED);
+ assert(pthread_join(t, &result) == 0);
+ assert(result == (void*)PTHREAD_CANCELED);
return 0;
}