Identify more precisly where GLdouble->GLfloat is needed in freeglut header

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1188 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h
index 12f0825..9353d22 100644 (file)
--- a/include/GL/freeglut_ext.h
+++ b/include/GL/freeglut_ext.h
@@ -163,10 +163,18 @@ FGAPI void    FGAPIENTRY glutStrokeString( void* font, const unsigned char *stri
  */
 FGAPI void    FGAPIENTRY glutWireRhombicDodecahedron( void );
 FGAPI void    FGAPIENTRY glutSolidRhombicDodecahedron( void );
+
+#ifdef EGL_VERSION_1_0
+/* TODO: temporary work-around for missing GLdouble in GLES */
+#   define GLdouble     GLfloat
+#endif
 FGAPI void    FGAPIENTRY glutWireSierpinskiSponge ( int num_levels, GLdouble offset[3], GLdouble scale );
 FGAPI void    FGAPIENTRY glutSolidSierpinskiSponge ( int num_levels, GLdouble offset[3], GLdouble scale );
 FGAPI void    FGAPIENTRY glutWireCylinder( GLdouble radius, GLdouble height, GLint slices, GLint stacks);
 FGAPI void    FGAPIENTRY glutSolidCylinder( GLdouble radius, GLdouble height, GLint slices, GLint stacks);
+#ifdef EGL_VERSION_1_0
+#   undef GLdouble
+#endif
 
 /*
  * Extension functions, see freeglut_ext.c

diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
index 799987e..8bcfbd4 100644 (file)
--- a/include/GL/freeglut_std.h
+++ b/include/GL/freeglut_std.h
@@ -526,7 +526,7 @@ FGAPI int     FGAPIENTRY glutStrokeLength( void* font, const unsigned char* stri
  */
 #ifdef EGL_VERSION_1_0
 /* TODO: temporary work-around for missing GLdouble in GLES */
-#   define GLdouble     GLfloat  
+#   define GLdouble     GLfloat
 #endif
 
 FGAPI void    FGAPIENTRY glutWireCube( GLdouble size );
@@ -553,6 +553,11 @@ FGAPI void    FGAPIENTRY glutSolidIcosahedron( void );
 FGAPI void    FGAPIENTRY glutWireTeapot( GLdouble size );
 FGAPI void    FGAPIENTRY glutSolidTeapot( GLdouble size );
 
+#ifdef EGL_VERSION_1_0
+/* TODO: temporary work-around for missing GLdouble in GLES */
+#   undef GLdouble
+#endif
+
 /*
  * Game mode functions, see freeglut_gamemode.c
  */