aboutsummaryrefslogtreecommitdiff
path: root/src/pj_mutex.c
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2009-09-23 19:35:33 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2009-09-23 19:35:33 +0000
commit675cfa5582d96fa600000b88bee251bf26434f2a (patch)
tree23bf937cd3bb1e1a9ae7fd4d4c927325566dda34 /src/pj_mutex.c
parent474e11f0b26079cc490dfedce40bd25fcaabb32c (diff)
downloadPROJ-675cfa5582d96fa600000b88bee251bf26434f2a.tar.gz
PROJ-675cfa5582d96fa600000b88bee251bf26434f2a.zip
implement mutex locking for loading/caching grid shift files
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1626 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/pj_mutex.c')
-rw-r--r--src/pj_mutex.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pj_mutex.c b/src/pj_mutex.c
index b3e4e8ee..60d6fc74 100644
--- a/src/pj_mutex.c
+++ b/src/pj_mutex.c
@@ -27,10 +27,14 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
-#include <proj_api.h>
+
+/* projects.h and windows.h conflict - avoid this! */
#ifndef _WIN32
+#include <projects.h>
PJ_CVSID("$Id: pj_transform.c 1504 2009-01-06 02:11:57Z warmerdam $");
+#else
+#include <proj_api.h>
#endif
#ifdef _WIN32