Mercurial > mxe-octave

view src/proj-mutex-win32.patch @ 928:7cc0952ea996

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
children
line wrap: on
line source

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