From 21ad5627da7e76042dec0c7d592922f2658e9306 Mon Sep 17 00:00:00 2001 From: Frank Warmerdam Date: Sun, 7 Aug 2011 21:02:32 +0000 Subject: rename core_lock to avoid conflict on AIX (#55) git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2082 4e78687f-474d-0410-85f9-8d5e500ac6b2 --- src/pj_mutex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/pj_mutex.c b/src/pj_mutex.c index 903ab236..2e91f33f 100644 --- a/src/pj_mutex.c +++ b/src/pj_mutex.c @@ -105,7 +105,7 @@ static void pj_init_lock() #include "pthread.h" -static pthread_mutex_t core_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t pj_core_lock = PTHREAD_MUTEX_INITIALIZER; /************************************************************************/ /* pj_acquire_lock() */ @@ -115,7 +115,7 @@ static pthread_mutex_t core_lock = PTHREAD_MUTEX_INITIALIZER; void pj_acquire_lock() { - pthread_mutex_lock( &core_lock); + pthread_mutex_lock( &pj_core_lock); } /************************************************************************/ @@ -126,7 +126,7 @@ void pj_acquire_lock() void pj_release_lock() { - pthread_mutex_unlock( &core_lock ); + pthread_mutex_unlock( &pj_core_lock ); } /************************************************************************/ -- cgit v1.2.3