timers internally now use 64bit unsigned int, if available

[freeglut] / src / Common / freeglut_misc.c

diff --git a/src/Common/freeglut_misc.c b/src/Common/freeglut_misc.c
index 4aa809a..b0beb39 100644 (file)
--- 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 )