blob: 00b33707bbae46299cdcc524c3ebbf02ea757d34 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
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
|