More prerelease updates.

[simgear.git] / simgear / compiler.h

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 824c9024cf2d9187fafbcc49c1a36e78111b1027..ec05e881d3844907b6eb7e6e7bdc173dbdfc3d52 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
@@ -369,6 +364,23 @@
 
 #endif // __ICC
 
+//
+// Platform dependent gl.h and glut.h definitions
+//
+
+#ifdef __APPLE__
+#  define SG_GL_H <OpenGL/gl.h>
+#  define SG_GLU_H <OpenGL/glu.h>
+#  define SG_GLEXT_H <OpenGL/glext.h>
+#  define SG_GLUT_H <GLUT/glut.h>
+#else
+#  define SG_GL_H <GL/gl.h>
+#  define SG_GLU_H <GL/glu.h>
+#  define SG_GLEXT_H <GL/glext.h>
+#  define SG_GLUT_H <GL/glut.h>
+#endif
+
+
 //
 // No user modifiable definitions beyond here.
 //