Mercurial > mxe-octave

view src/proj-1-mutex-win32.patch @ 1713:318f6b6153bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 27 Mar 2011 23:36:16 +0200
parents 4df75ab7a04d
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:
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