Mercurial > mxe-octave

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
928
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
1 This file is part of mingw-cross-env.
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
2 See doc/index.html for further information.
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
4 This patch has been taken from upstream. More information:
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
5 http://trac.osgeo.org/proj/ticket/56
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
6 http://trac.osgeo.org/proj/changeset/1790
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
7
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
8 --- proj/src/pj_mutex.c (revision 1788)
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
9 +++ proj/src/pj_mutex.c (revision 1790)
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
10 @@ -38,6 +38,8 @@
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
11 #endif
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13 -#ifdef _WIN32
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
14 +/* on win32 we always use win32 mutexes, even if pthreads are available */
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
15 +#if defined(_WIN32) && !defined(MUTEX_stub)
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
16 # define MUTEX_win32
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 +# undef MUTEX_pthread
7cc0952ea996 use the better official patch to fix the mutex issue for package proj
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18 #endif