Index: cmake/modules/FindPTHREAD.cmake
===================================================================
RCS file: /repository/gd/libgd/cmake/modules/FindPTHREAD.cmake,v
retrieving revision 1.2
diff -u -r1.2 FindPTHREAD.cmake
--- cmake/modules/FindPTHREAD.cmake	25 Jan 2007 00:08:59 -0000	1.2
+++ cmake/modules/FindPTHREAD.cmake	2 Mar 2007 11:40:15 -0000
@@ -78,6 +78,7 @@
 
   IF(PTHREAD_LIBRARIES AND PTHREAD_INCLUDE_DIR)
     SET(PTHREAD_FOUND TRUE)
+    SET(HAVE_PTHREAD 1)
   ELSE(PTHREAD_LIBRARIES AND PTHREAD_INCLUDE_DIR)
     SET(PTHREAD_FOUND FALSE)
   ENDIF(PTHREAD_LIBRARIES AND PTHREAD_INCLUDE_DIR)
@@ -86,6 +87,6 @@
   #  PTHREAD_INCLUDE_DIR
   #  PTHREAD_LIBRARIES
   #  )
-  #MESSAGE(STATUS "PTHREAD_FOUND : ${PTHREAD_FOUND}")
+  MESSAGE(STATUS "PTHREAD_FOUND: ${PTHREAD_FOUND}")
 
 #ENDIF(NOT UNIX AND NOT WIN32)
Index: gdhelpers.h
===================================================================
RCS file: /repository/gd/libgd/gdhelpers.h,v
retrieving revision 1.7
diff -u -r1.7 gdhelpers.h
--- gdhelpers.h	5 Apr 2006 15:54:20 -0000	1.7
+++ gdhelpers.h	2 Mar 2007 11:40:16 -0000
@@ -32,7 +32,7 @@
 #ifdef WIN32
 /* 2.0.18: must include windows.h to get CRITICAL_SECTION. */
 #include <windows.h>
-#define gdMutexDeclare(x) CRITICAL_SECTION x
+#define gdMutexDeclare(x) static CRITICAL_SECTION x
 #define gdMutexSetup(x) InitializeCriticalSection(&x)
 #define gdMutexShutdown(x) DeleteCriticalSection(&x)
 #define gdMutexLock(x) EnterCriticalSection(&x)
@@ -40,9 +40,9 @@
 #else
 #ifdef HAVE_PTHREAD
 #include <pthread.h>
-#define gdMutexDeclare(x) pthread_mutex_t x
-#define gdMutexSetup(x) pthread_mutex_init(&x, 0)
-#define gdMutexShutdown(x) pthread_mutex_destroy(&x)
+#define gdMutexDeclare(x) static pthread_mutex_t x = PTHREAD_MUTEX_INITIALIZER
+#define gdMutexSetup(x)
+#define gdMutexShutdown(x)
 #define gdMutexLock(x) pthread_mutex_lock(&x)
 #define gdMutexUnlock(x) pthread_mutex_unlock(&x)
 #else