From 4e01bab2ff89a6e86dcc12267b7a6be63d0a494b Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Sun, 24 Jan 2010 23:19:26 +0000
Subject: avoid win32/pthread mutex conflict on unixlike builds for win32 (#56)

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1790 4e78687f-474d-0410-85f9-8d5e500ac6b2
---
 src/pj_mutex.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pj_mutex.c b/src/pj_mutex.c
index 3399ac12..903ab236 100644
--- a/src/pj_mutex.c
+++ b/src/pj_mutex.c
@@ -37,8 +37,10 @@ PJ_CVSID("$Id: pj_transform.c 1504 2009-01-06 02:11:57Z warmerdam $");
 #include <proj_api.h>
 #endif
 
-#ifdef _WIN32
+/* on win32 we always use win32 mutexes, even if pthreads are available */
+#if defined(_WIN32) && !defined(MUTEX_stub)
 #  define MUTEX_win32
+#  undef  MUTEX_pthread
 #endif
 
 #if !defined(MUTEX_stub) && !defined(MUTEX_pthread) && !defined(MUTEX_win32)
-- 
cgit v1.2.3