Mercurial > mxe-octave

annotate src/proj-1-mutex-win32.patch @ 973:4df75ab7a04d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add information about the origin of various patches
author Volker Grabsch <vog@notjusthosting.com>
date Fri, 14 May 2010 21:47:30 +0200
parents e5d55b815b89
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
972
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
1 This file is part of mingw-cross-env.
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
2 See doc/index.html for further information.
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
973
4df75ab7a04d add information about the origin of various patches
Volker Grabsch <vog@notjusthosting.com>
parents: 972
diff changeset
4 This patch has been taken from:
972
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
5 http://trac.osgeo.org/proj/ticket/56
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
6 http://trac.osgeo.org/proj/changeset/1790
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
7
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
8 --- proj/src/pj_mutex.c (revision 1788)
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
9 +++ proj/src/pj_mutex.c (revision 1790)
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
10 @@ -38,6 +38,8 @@
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
11 #endif
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13 -#ifdef _WIN32
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
14 +/* on win32 we always use win32 mutexes, even if pthreads are available */
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
15 +#if defined(_WIN32) && !defined(MUTEX_stub)
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
16 # define MUTEX_win32
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 +# undef MUTEX_pthread
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18 #endif