MacOS X fix

[simgear.git] / simgear / compiler.h

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 7d2e6da572995c0ec59253d6bbdd9ea5b234e360..5f02adb27bfeccab9c550d19e7094585e1acc624 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -131,9 +131,35 @@
 //
 
 #ifdef __APPLE__
+#  ifdef __GNUC__
+#    if ( __GNUC__ >= 3 ) && ( __GNUC_MINOR__ >= 3 )
 inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
-#else
+#    else
+    // any C++ header file undefines isinf and isnan
+    // so this should be included before <iostream>
+    // the functions are STILL in libm (libSystem on mac os x)
+extern "C" int (isnan)(double);
+extern "C" int (isinf)(double);
+#    endif
+#  else
+inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
+#  endif
+#endif
 
+#if defined (__FreeBSD__)
+#  if __FreeBSD_version < 500000
+     extern "C" {
+       inline int isnan(double r) { return !(r <= 0 || r >= 0); }
+     }
+#  endif
+#endif
+
+#if defined (__CYGWIN__)
+#  include <ieeefp.h>          // isnan
+#endif
+
+#if defined(__MINGW32__)
+#  define isnan(x) _isnan(x)
 #endif
 
 
@@ -141,10 +167,5 @@ inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
 // No user modifiable definitions beyond here.
 //
 
-/** \def SG_USING_STD(x)
- *  Expands to using std::X
- */
-#  define SG_USING_STD(X) using std::X
-
 #endif // _SG_COMPILER_H