# 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
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
#ifdef __APPLE__
# define SG_GL_H <OpenGL/gl.h>
+# define SG_GLX_H <OpenGL/glx.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