Mercurial > mxe-octave
changeset 928:7cc0952ea996
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
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Sun, 02 May 2010 03:25:19 +0200 |
| parents | a44903866347 |
| children | 083dd13e3eb2 |
| files | src/proj-mutex-win32.patch src/proj-win32.patch |
| diffstat | 2 files changed, 18 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/proj-mutex-win32.patch Sun May 02 03:25:19 2010 +0200 @@ -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
--- a/src/proj-win32.patch Sun May 02 03:14:43 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 -