diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-05-02 01:25:19 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-05-02 01:25:19 (GMT) |
| commit | 9ece6479d9e5b11f6aaba98bd0cf6df4305041c4 (patch) | |
| tree | 0b855e4b9c9b84959f540147cedfbf8d524e6e31 /src | |
| parent | 31917d198b84e6d3c14744fc19980e2c340a73fe (diff) | |
| download | mxe-9ece6479d9e5b11f6aaba98bd0cf6df4305041c4.zip mxe-9ece6479d9e5b11f6aaba98bd0cf6df4305041c4.tar.gz mxe-9ece6479d9e5b11f6aaba98bd0cf6df4305041c4.tar.bz2 | |
use the better official patch to fix the mutex issue for package proj
More information:
http://trac.osgeo.org/proj/ticket/56
http://trac.osgeo.org/proj/changeset/1790
Diffstat (limited to 'src')
| -rw-r--r-- | src/proj-mutex-win32.patch | 18 | ||||
| -rw-r--r-- | src/proj-win32.patch | 15 |
2 files changed, 18 insertions, 15 deletions
diff --git a/src/proj-mutex-win32.patch b/src/proj-mutex-win32.patch new file mode 100644 index 0000000..00b3370 --- /dev/null +++ b/src/proj-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 diff --git a/src/proj-win32.patch b/src/proj-win32.patch deleted file mode 100644 index d643ad0..0000000 --- a/src/proj-win32.patch +++ /dev/null @@ -1,15 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ru proj-4.7.0.orig/src/pj_mutex.c proj-4.7.0/src/pj_mutex.c ---- proj-4.7.0.orig/src/pj_mutex.c 2009-09-23 21:03:26.000000000 +0200 -+++ proj-4.7.0/src/pj_mutex.c 2009-10-03 23:32:03.000000000 +0200 -@@ -37,7 +37,7 @@ - #include <proj_api.h> - #endif - --#ifdef _WIN32 -+#if defined(_WIN32) && !defined(MUTEX_pthread) - # define MUTEX_win32 - #endif - |