Update the code a bit more, add a function to retreive the last error string and...

[simgear.git] / simgear / compiler.h

diff --git a/simgear/compiler.h b/simgear/compiler.h
index b6ae6c7d40322d50a37daeb27f6eaaa417d75b86..05a4a36b171d3f944e49d1f5ae1970943f667b84 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
@@ -371,13 +371,13 @@
 #ifdef __APPLE__
 #  define SG_GL_H <OpenGL/gl.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_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