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

1 files changed, 4 insertions, 4 deletions

diff --git a/pthreads/tests/barrier3.c b/pthreads/tests/barrier3.c
index 3e4009068..dece77068 100644
--- a/pthreads/tests/barrier3.c
+++ b/pthreads/tests/barrier3.c
@@ -41,11 +41,11 @@
 #include "test.h"
  
 pthread_barrier_t barrier = NULL;
-static int result = 1;
+static void* result = (void*)1;
 
 void * func(void * arg)
 {
-  return (void *) pthread_barrier_wait(&barrier);
+  return (void *) (size_t)pthread_barrier_wait(&barrier);
 }
  
 int
@@ -60,9 +60,9 @@ main()
 
   assert(pthread_create(&t, NULL, func, NULL) == 0);
 
-  assert(pthread_join(t, (void **) &result) == 0);
+  assert(pthread_join(t, &result) == 0);
 
-  assert(result == PTHREAD_BARRIER_SERIAL_THREAD);
+  assert((int)(size_t)result == PTHREAD_BARRIER_SERIAL_THREAD);
 
   assert(pthread_barrier_destroy(&barrier) == 0);
   assert(pthread_barrierattr_destroy(&ba) == 0);