X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_misc.c;h=b0beb39f6c3ebcc2e8d47fd7866ae17b23fcf665;hb=1ede9f68f98e29ddd07bd466310967e716bfac92;hp=4aa809ac439e1aa1607be331aad2b541beb4ea82;hpb=76169d74298feb3c4976af3f0f10376f56aec38d;p=freeglut

diff --git a/src/Common/freeglut_misc.c b/src/Common/freeglut_misc.c
index 4aa809a..b0beb39 100644
--- a/src/Common/freeglut_misc.c
+++ b/src/Common/freeglut_misc.c
@@ -109,8 +109,10 @@ static const char* fghErrorString( GLenum error )
   case GL_INVALID_ENUM: return "invalid enumerant";
   case GL_INVALID_VALUE: return "invalid value";
   case GL_INVALID_OPERATION: return "invalid operation";
+#ifndef GL_ES_VERSION_2_0
   case GL_STACK_OVERFLOW: return "stack overflow";
   case GL_STACK_UNDERFLOW: return "stack underflow";
+#endif
   case GL_OUT_OF_MEMORY: return "out of memory";
   case GL_TABLE_TOO_LARGE: return "table too large";
   case GL_INVALID_FRAMEBUFFER_OPERATION: return "invalid framebuffer operation";
@@ -171,19 +173,6 @@ void FGAPIENTRY glutSetKeyRepeat( int repeatMode )
 }
 
 /*
- * Forces the joystick callback to be executed
- */
-void FGAPIENTRY glutForceJoystickFunc( void )
-{
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutForceJoystickFunc" );
-#if !defined(_WIN32_WCE)
-    freeglut_return_if_fail( fgStructure.CurrentWindow != NULL );
-    freeglut_return_if_fail( FETCH_WCB( *( fgStructure.CurrentWindow ), Joystick ) );
-    fgJoystickPollWindow( fgStructure.CurrentWindow );
-#endif /* !defined(_WIN32_WCE) */
-}
-
-/*
  *
  */
 void FGAPIENTRY glutSetColor( int nColor, GLfloat red, GLfloat green, GLfloat blue )