summaryrefslogtreecommitdiff
path: root/geography/geos/patches/patch-include-geos-platform.h.in
diff options
context:
space:
mode:
Diffstat (limited to 'geography/geos/patches/patch-include-geos-platform.h.in')
-rw-r--r--geography/geos/patches/patch-include-geos-platform.h.in13
1 files changed, 7 insertions, 6 deletions
diff --git a/geography/geos/patches/patch-include-geos-platform.h.in b/geography/geos/patches/patch-include-geos-platform.h.in
index 9fb85d66142..abfdab74d61 100644
--- a/geography/geos/patches/patch-include-geos-platform.h.in
+++ b/geography/geos/patches/patch-include-geos-platform.h.in
@@ -1,20 +1,21 @@
-$NetBSD: patch-include-geos-platform.h.in,v 1.4 2012/03/12 09:46:06 fhajny Exp $
+$NetBSD: patch-include-geos-platform.h.in,v 1.5 2013/08/18 11:06:25 gdt Exp $
Fix isnan definition on NetBSD, DragonFly and SunOS platforms.
---- include/geos/platform.h.in.orig 2011-09-17 15:42:58.000000000 +0000
+--- include/geos/platform.h.in.orig 2013-08-11 04:23:47.000000000 +0000
+++ include/geos/platform.h.in
-@@ -91,11 +91,12 @@ extern "C"
- # elif defined(__MINGW32__)
+@@ -91,11 +91,13 @@ extern "C"
+ # elif defined(__MINGW32__) || defined(__CYGWIN__)
// sandro furieri: sanitizing MinGW32
# define ISNAN(x) (std::isnan(x))
-# elif defined(__OSX__) || defined(__APPLE__)
-+# elif defined(__OSX__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__) || \
++# elif defined(__OSX__) || defined(__APPLE__) || \
++ defined(__NetBSD__) || defined(__DragonFly__) || \
+ (defined(__sun) && defined(__GNUC__))
// Hack for OS/X <cmath> incorrectly re-defining isnan() into oblivion.
// It does leave a version in std.
# define ISNAN(x) (std::isnan(x))
-# elif defined(__sun) || defined(__sun__)
-+# elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC)
++# elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC)
# include <math.h>
# define ISNAN(x) (::isnan(x))
# endif