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, 3 insertions, 12 deletions

diff --git a/pthreads/ptw32_processTerminate.c b/pthreads/ptw32_processTerminate.c
index d2dfa7a24..83f0f23ca 100644
--- a/pthreads/ptw32_processTerminate.c
+++ b/pthreads/ptw32_processTerminate.c
@@ -65,6 +65,7 @@ ptw32_processTerminate (void)
   if (ptw32_processInitialized)
     {
       ptw32_thread_t * tp, * tpNext;
+      ptw32_mcs_local_node_t node;
 
       if (ptw32_selfThreadKey != NULL)
 	{
@@ -86,7 +87,7 @@ ptw32_processTerminate (void)
 	  ptw32_cleanupKey = NULL;
 	}
 
-      EnterCriticalSection (&ptw32_thread_reuse_lock);
+      ptw32_mcs_lock_acquire(&ptw32_thread_reuse_lock, &node);
 
       tp = ptw32_threadReuseTop;
       while (tp != PTW32_THREAD_REUSE_EMPTY)
@@ -96,17 +97,7 @@ ptw32_processTerminate (void)
 	  tp = tpNext;
 	}
 
-      LeaveCriticalSection (&ptw32_thread_reuse_lock);
-
-      /* 
-       * Destroy the global locks and other objects.
-       */
-      DeleteCriticalSection (&ptw32_spinlock_test_init_lock);
-      DeleteCriticalSection (&ptw32_rwlock_test_init_lock);
-      DeleteCriticalSection (&ptw32_cond_test_init_lock);
-      DeleteCriticalSection (&ptw32_cond_list_lock);
-      DeleteCriticalSection (&ptw32_mutex_test_init_lock);
-      DeleteCriticalSection (&ptw32_thread_reuse_lock);
+      ptw32_mcs_lock_release(&node);
 
       ptw32_processInitialized = PTW32_FALSE;
     }