aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/cleanup3.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/cleanup3.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/cleanup3.c')
-rw-r--r--pthreads/tests/cleanup3.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/pthreads/tests/cleanup3.c b/pthreads/tests/cleanup3.c
index b595ab43c..62317b3b0 100644
--- a/pthreads/tests/cleanup3.c
+++ b/pthreads/tests/cleanup3.c
@@ -136,7 +136,7 @@ mythread(void * arg)
#pragma inline_depth()
#endif
- return (void *) result;
+ return (void *) (size_t)result;
}
int
@@ -183,18 +183,18 @@ main()
for (i = 1; i <= NUMTHREADS; i++)
{
int fail = 0;
- int result = 0;
+ void* result = (void*)0;
- assert(pthread_join(t[i], (void **) &result) == 0);
+ assert(pthread_join(t[i], &result) == 0);
- fail = (result != 0);
+ fail = ((int)(size_t)result != 0);
if (fail)
{
fprintf(stderr, "Thread %d: started %d: result: %d\n",
i,
threadbag[i].started,
- result);
+ (int)(size_t)result);
}
failed = (failed || fail);
}