diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2011-08-07 21:02:32 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2011-08-07 21:02:32 +0000 |
| commit | 21ad5627da7e76042dec0c7d592922f2658e9306 (patch) | |
| tree | 9cd4e87ead0931deaa51c21c2728386fb0da7718 | |
| parent | 2f0f94de078115890d86fe1794cb159f54700fbf (diff) | |
| download | PROJ-21ad5627da7e76042dec0c7d592922f2658e9306.tar.gz PROJ-21ad5627da7e76042dec0c7d592922f2658e9306.zip | |
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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/pj_mutex.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2011-08-07 Frank Warmerdam <warmerdam@pobox.com> + + * src/pj_mutex.c: alter name of core_lock to avoid conflict on AIX (#55) + 2011-07-23 <warmerdam@pobox.com> * configure.in, Makefile.am, proj.pc.in: Added pkg-config support (#3) 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 ); } /************************************************************************/ |