X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fcompiler.h;h=616dd15d2f025dd8e2564557837d3a93bf3deb67;hb=c3133f020d257af9cdab6d6a88014327b1b8e58d;hp=7d2e6da572995c0ec59253d6bbdd9ea5b234e360;hpb=c7cbb22667c901e6107dd099e02e9506f9fbd360;p=simgear.git

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 7d2e6da5..616dd15d 100644
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -63,7 +63,14 @@
 #  if _MSC_VER >= 1200  // msvc++ 6.0 or greater
 #    define isnan _isnan
 #    define snprintf _snprintf
+#    if _MSC_VER < 1500
+#      define vsnprintf _vsnprintf
+#    endif
 #    define copysign _copysign
+#    define strcasecmp stricmp
+
+#    undef min
+#    undef max
 
 #    pragma warning(disable: 4786) // identifier was truncated to '255' characters
 #    pragma warning(disable: 4244) // conversion from double to float
@@ -131,9 +138,31 @@
 //
 
 #ifdef __APPLE__
+#  ifdef __GNUC__
+#    if ( __GNUC__ > 3 ) || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 3 )
+inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
+#    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); }
-#else
+#  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
 
 
@@ -141,10 +170,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