Merge 1205f97 into 2db1400

OSGeo · Feb 26, 2019 · 01ec344 · 01ec344
2 parents 2db1400 + 1205f97
commit 01ec344
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/mutex.cpp b/src/mutex.cpp
@@ -25,14 +25,6 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
-
-/* projects.h and windows.h conflict - avoid this! */
-
-#if defined(MUTEX_pthread) && !defined(_XOPEN_SOURCE) && !defined(__sun)
-/* For pthread_mutexattr_settype */
-#define _XOPEN_SOURCE 500
-#endif
-
 /* For PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE

diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
@@ -5035,7 +5035,7 @@ Two Point Equidistant
 -------------------------------------------------------------------------------
 operation +proj=tpeqd   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.15 mm
+tolerance 0.18 mm
 accept  2 1
 expect  -27750.758831679 -222599.403691777
 accept  2 -1