Patch from Melchior Franz:

[simgear.git] / simgear / compiler.h

diff --git a/simgear/compiler.h b/simgear/compiler.h
index b64e8386832aa1f55d3802835b72e6fdb2aae918..1fa75a3fb9e3d124e1274d0f2ced42459cf0ef36 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,18 @@
 #  define STL_STRING     <string>
 #  define STL_STRSTREAM  <strstream.h>
 
-#  define __STL_FUNCTION_TMPL_PARTIAL_ORDER
+// #  define __STL_FUNCTION_TMPL_PARTIAL_ORDER
+// typedef void PFNGLPOINTPARAMETERFEXTPROC
 
-#pragma set woff 1001,1012,1014,1116,1172,1174,1401,146,0
-#pragma set woff 1551,1552,1681
+#define glPointParameterfEXT   glPointParameterfSGIS
+#define glPointParameterfvEXT  glPointParameterfvSGIS
+
+#pragma set woff 1001,1012,1014,1116,1155,1172,1174
+#pragma set woff 1401,1460,1551,1552,1681
+
+#ifdef __cplusplus
+#pragma set woff 1682,3303
+#endif
 
 #endif // Native SGI compilers
 
@@ -299,6 +312,27 @@
 #  endif // __cplusplus
 #endif // sun
 
+//
+// Intel C++ Compiler
+//
+#if defined(__ICC)
+#  define SG_NAMESPACES
+#  define SG_HAVE_STD
+#  define SG_HAVE_STREAMBUF
+#  define SG_HAVE_TRAITS
+#  define SG_HAVE_STD_INCLUDES
+
+#  define STL_ALGORITHM  <algorithm>
+#  define STL_FUNCTIONAL <functional>
+#  define STL_IOMANIP    <iomanip>
+#  define STL_IOSTREAM   <iostream>
+#  define STL_ITERATOR   <iterator>
+#  define STL_FSTREAM    <fstream>
+#  define STL_STDEXCEPT  <stdexcept>
+#  define STL_STRING     <string>
+#  define STL_STRSTREAM  <strstream>
+#endif // __ICC
+
 //
 // No user modifiable definitions beyond here.
 //