MSVC fix.

[simgear.git] / simgear / compiler.h

diff --git a/simgear/compiler.h b/simgear/compiler.h
index b6ae6c7d40322d50a37daeb27f6eaaa417d75b86..3af548df6ecf67c9a7ee8e25113ecf9bb08f2ee7 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -121,7 +121,7 @@
 #      define STL_STRSTREAM  <strstream>
 
 #    endif
-#  elif __GNUC__ == 3
+#  elif __GNUC__ >= 3
        // g++-3.0.x
 #      define SG_EXPLICIT_FUNCTION_TMPL_ARGS
 #      define SG_NEED_AUTO_PTR
@@ -336,7 +336,9 @@
      extern void *memmove(void *, const void *, size_t);
 #  endif // __cplusplus
 
-#  define SG_COMPILER_STR "Sun compiler version " SG_STRINGIZE(__SUNPRO_CC)
+#  if  !defined( __GNUC__ )
+#   define SG_COMPILER_STR "Sun compiler version " SG_STRINGIZE(__SUNPRO_CC)
+#  endif
 
 #endif // sun
 
@@ -370,14 +372,16 @@
 
 #ifdef __APPLE__
 #  define SG_GL_H <OpenGL/gl.h>
+#  define SG_GLX_H <AGL/agl.h>
 #  define SG_GLU_H <OpenGL/glu.h>
-#  define SG_GLUT_H <OpenGL/glut.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_GLX_H <GL/glx.h>
 #  define SG_GLU_H <GL/glu.h>
-#  define SG_GLUT_H <GL/glut.h>
 #  define SG_GLEXT_H <GL/glext.h>
+#  define SG_GLUT_H <GL/glut.h>
 #endif