MingW fix.

[simgear.git] / simgear / compiler.h

diff --git a/simgear/compiler.h b/simgear/compiler.h
index a709b9011664b423f1d509c2c6333ecf6640d27e..9123ab19729285723002a510378ddf1fefd99e65 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -149,12 +149,6 @@
 
 #endif // __GNUC__
 
-#if defined( __MINGW32__ )
-#  define bcopy(from, to, n) memcpy(to, from, n)
-#  define FG_MEM_COPY(to,from,n) memcpy(to, from, n)
-#  define snprintf _snprintf
-#endif
-
 /* KAI C++ */
 #if defined(__KCC)
 
@@ -235,6 +229,7 @@
 #    define STL_STRING     <string>
 #    define STL_STRSTREAM  <strstream>
 
+#    define isnan _isnan
 #    define snprintf _snprintf
 
 #    pragma warning(disable: 4786) // identifier was truncated to '255' characters
@@ -308,7 +303,7 @@
 #  define STL_FSTREAM    <fstream>
 #  define STL_STDEXCEPT  <stdexcept>
 #if (_COMPILER_VERSION < 740)
-#  define STL_STRING     <simgear/compatibility/irix_string>
+#  define STL_STRING     <irix_string>
 #else
 #  define STL_STRING     <string>
 #endif
@@ -319,6 +314,9 @@
 
 #ifdef __cplusplus
 #pragma set woff 1682,3303
+#if (_COMPILER_VERSION >= 740)
+#  pragma set woff 3624
+#endif
 #endif
 
 #  define SG_COMPILER_STR "SGI MipsPro compiler version " SG_STRINGIZE(_COMPILER_VERSION)