Misc Irix tweaks.

[simgear.git] / simgear / compiler.h

diff --git a/simgear/compiler.h b/simgear/compiler.h
index b64e8386832aa1f55d3802835b72e6fdb2aae918..86c7ee8cde6fcd54046eef5507a5401e834bf4aa 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -139,6 +139,11 @@
 #  endif
 #endif
 
+#if defined( __MINGW32__ )
+#  define bcopy(from, to, n) memcpy(to, from, n)
+#  define FG_MEM_COPY(to,from,n) memcpy(to, from, n)
+#endif
+
 /* KAI C++ */
 #if defined(__KCC)
 
@@ -278,10 +283,14 @@
 #  define STL_STRING     <string>
 #  define STL_STRSTREAM  <strstream.h>
 
-#  define __STL_FUNCTION_TMPL_PARTIAL_ORDER
+// #  define __STL_FUNCTION_TMPL_PARTIAL_ORDER
+
+#pragma set woff 1001,1012,1014,1116,1155,1172,1174
+#pragma set woff 1401,1460,1551,1552,1681
 
-#pragma set woff 1001,1012,1014,1116,1172,1174,1401,146,0
-#pragma set woff 1551,1552,1681
+#ifdef __cplusplus
+#pragma set woff 1682,3303
+#endif
 
 #endif // Native SGI compilers