diff options
Diffstat (limited to 'src/proj-1-mutex-win32.patch')
| -rw-r--r-- | src/proj-1-mutex-win32.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/proj-1-mutex-win32.patch b/src/proj-1-mutex-win32.patch new file mode 100644 index 0000000..00b3370 --- /dev/null +++ b/src/proj-1-mutex-win32.patch @@ -0,0 +1,18 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from upstream. More information: +http://trac.osgeo.org/proj/ticket/56 +http://trac.osgeo.org/proj/changeset/1790 + +--- proj/src/pj_mutex.c (revision 1788) ++++ proj/src/pj_mutex.c (revision 1790) +@@ -38,6 +38,8 @@ + #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 |