diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2010-01-24 23:19:26 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2010-01-24 23:19:26 +0000 |
| commit | 4e01bab2ff89a6e86dcc12267b7a6be63d0a494b (patch) | |
| tree | c9d433dce0596fd2a58882268c4af35183c2086f | |
| parent | e525ab9ff2adcf195fc7eea173f2fce45f7fd8f5 (diff) | |
| download | PROJ-4e01bab2ff89a6e86dcc12267b7a6be63d0a494b.tar.gz PROJ-4e01bab2ff89a6e86dcc12267b7a6be63d0a494b.zip | |
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
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/pj_mutex.c | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -1,5 +1,8 @@ 2010-01-25 Frank Warmerdam <warmerdam@pobox.com> + * 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 <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) |