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, 10 insertions, 10 deletions

diff --git a/pthreads/tests/spin4.c b/pthreads/tests/spin4.c
index 8386d0956..3a4fd6f24 100644
--- a/pthreads/tests/spin4.c
+++ b/pthreads/tests/spin4.c
@@ -41,8 +41,8 @@
 #include <sys/timeb.h>
  
 pthread_spinlock_t lock = PTHREAD_SPINLOCK_INITIALIZER;
-struct _timeb currSysTimeStart;
-struct _timeb currSysTimeStop;
+PTW32_STRUCT_TIMEB currSysTimeStart;
+PTW32_STRUCT_TIMEB currSysTimeStop;
 
 #define GetDurationMilliSecs(_TStart, _TStop) ((_TStop.time*1000+_TStop.millitm) \
 					       - (_TStart.time*1000+_TStart.millitm))
@@ -51,22 +51,22 @@ static int washere = 0;
 
 void * func(void * arg)
 {
-  _ftime(&currSysTimeStart);
+  PTW32_FTIME(&currSysTimeStart);
   washere = 1;
   assert(pthread_spin_lock(&lock) == 0);
   assert(pthread_spin_unlock(&lock) == 0);
-  _ftime(&currSysTimeStop);
+  PTW32_FTIME(&currSysTimeStop);
 
-  return (void *) GetDurationMilliSecs(currSysTimeStart, currSysTimeStop);
+  return (void *)(size_t)GetDurationMilliSecs(currSysTimeStart, currSysTimeStop);
 }
  
 int
 main()
 {
-  long result = 0;
+  void* result = (void*)0;
   pthread_t t;
   int CPUs;
-  struct _timeb sysTime;
+  PTW32_STRUCT_TIMEB sysTime;
 
   if ((CPUs = pthread_num_processors_np()) == 1)
     {
@@ -86,14 +86,14 @@ main()
   do
     {
       sched_yield();
-      _ftime(&sysTime);
+      PTW32_FTIME(&sysTime);
     }
   while (GetDurationMilliSecs(currSysTimeStart, sysTime) <= 1000);
 
   assert(pthread_spin_unlock(&lock) == 0);
 
-  assert(pthread_join(t, (void **) &result) == 0);
-  assert(result > 1000);
+  assert(pthread_join(t, &result) == 0);
+  assert((int)(size_t)result > 1000);
 
   assert(pthread_spin_destroy(&lock) == 0);