Fix more compiler warnings

[freeglut] / src / fg_ext.c

diff --git a/src/fg_ext.c b/src/fg_ext.c
index 6d50717..82b6304 100644 (file)
--- a/src/fg_ext.c
+++ b/src/fg_ext.c
@@ -126,9 +126,11 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
     CHECK_NAME(glutStrokeWidth);
     CHECK_NAME(glutBitmapLength);
     CHECK_NAME(glutStrokeLength);
-#ifndef EGL_VERSION_1_0
+#ifndef GL_ES_VERSION_2_0
     CHECK_NAME(glutWireSphere);
     CHECK_NAME(glutSolidSphere);
+#endif
+#ifndef EGL_VERSION_1_0
     CHECK_NAME(glutWireCone);
     CHECK_NAME(glutSolidCone);
     CHECK_NAME(glutWireTorus);
@@ -138,7 +140,6 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
     CHECK_NAME(glutWireTeapot);
     CHECK_NAME(glutSolidTeapot);
 #endif
-#ifndef GL_ES_VERSION_2_0
     CHECK_NAME(glutWireCube);
     CHECK_NAME(glutSolidCube);
     CHECK_NAME(glutWireDodecahedron);
@@ -149,11 +150,12 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
     CHECK_NAME(glutSolidTetrahedron);
     CHECK_NAME(glutWireIcosahedron);
     CHECK_NAME(glutSolidIcosahedron);
+#ifndef EGL_VERSION_1_0
     CHECK_NAME(glutWireRhombicDodecahedron);
     CHECK_NAME(glutSolidRhombicDodecahedron);
+#endif
     CHECK_NAME(glutWireSierpinskiSponge);
     CHECK_NAME(glutSolidSierpinskiSponge);
-#endif
     CHECK_NAME(glutVideoResizeGet);
     CHECK_NAME(glutSetupVideoResizing);
     CHECK_NAME(glutStopVideoResizing);
@@ -217,8 +219,8 @@ glutGetProcAddress( const char *procName )
     /* Try GLUT functions first, then core GL functions */
     p = fghGetGLUTProcAddress( procName );
 
-       /* Some GLUT functions are platform-specific: */
-       if ( !p )
+    /* Some GLUT functions are platform-specific: */
+    if ( !p )
       p = fgPlatformGetGLUTProcAddress( procName );
 
     return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName );