#endif // Native SGI compilers
-#if defined ( sun )
+#if defined (__sun)
# include <strings.h>
# include <memory.h>
# if defined ( __cplusplus )
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 <AGL/agl.h>
# define SG_GLU_H <OpenGL/glu.h>
# define SG_GLEXT_H <OpenGL/glext.h>
# define SG_GLUT_H <GLUT/glut.h>
+
+inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
#else
# define SG_GL_H <GL/gl.h>
+# define SG_GLX_H <GL/glx.h>
# define SG_GLU_H <GL/glu.h>
# define SG_GLEXT_H <GL/glext.h>
# define SG_GLUT_H <GL/glut.h>
#endif // SG_INCOMPLETE_FUNCTIONAL
#endif // _SG_COMPILER_H
+