Martin Spott: Revised handling of missing isnan() on earlier versions of

FreeBSD.

diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx
index d4557064c6de7aa5e2b2654cad9ccf9254186e09..dbc7d03d67d22cf5153fc671a6a16f52e46df644 100644 (file)
--- a/simgear/scene/sky/cloud.cxx
+++ b/simgear/scene/sky/cloud.cxx
@@ -46,11 +46,14 @@ inline int (isnan)(double r) { return isnan(r); }
 #endif
 
 #if defined (__FreeBSD__)
-inline int isnan(double r) { return !(r <= 0 || r >= 0); }
+#  if __FreeBSD_version < 500000
+     extern "C" {
+       inline int isnan(double r) { return !(r <= 0 || r >= 0); }
+     }
+#  endif
 #endif
 
 
-
 static ssgStateSelector *layer_states[SGCloudLayer::SG_MAX_CLOUD_COVERAGES];
 static bool state_initialized = false;
 static bool bump_mapping = false;

diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx
index e9e2dfbcdac0e757d701591303e8259ca5f8de45..9ec8355d9d3ae012ce737669428a5aff3ebac65f 100644 (file)
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -46,6 +46,15 @@ inline int (isnan)(double r) { return isnan(r); }
 #define isnan(x) _isnan(x)
 #endif
 
+#if defined (__FreeBSD__)
+#  if __FreeBSD_version < 500000
+     extern "C" {
+       inline int isnan(double r) { return !(r <= 0 || r >= 0); }
+     }
+#  endif
+#endif
+
+
 #if defined (__FreeBSD__)
 inline int isnan(double r) { return !(r <= 0 || r >= 0); }
 #endif