From 4e01bab2ff89a6e86dcc12267b7a6be63d0a494b Mon Sep 17 00:00:00 2001 From: Frank Warmerdam 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 --- ChangeLog | 3 +++ src/pj_mutex.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ca2c1c51..990fb49a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-01-25 Frank Warmerdam + * src/pj_mutex.c: avoid conflict between pthread and win32 mutex + implementations on unix-like build environments on windows. (#56) + * src/pj_init,src/projects.h,src/pj_transform.c,nad/testvarious: Correct seriously broken +lon_wrap implementation. (#62) 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 #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