Tidy nested if/else to suppress gcc -Wall -pedantic noise

[freeglut] / src / freeglut_misc.c

diff --git a/src/freeglut_misc.c b/src/freeglut_misc.c
index 7e0963e..2af1731 100644 (file)
--- a/src/freeglut_misc.c
+++ b/src/freeglut_misc.c
@@ -51,7 +51,7 @@
 int FGAPIENTRY glutExtensionSupported( const char* extension )
 {
   const char *extensions, *start;
-  const int len = strlen( extension ) ;
+  const int len = strlen( extension );
 
   /*
    * Make sure there is a current window, and thus a current context available
@@ -99,7 +99,7 @@ void FGAPIENTRY glutReportErrors( void )
  */
 void FGAPIENTRY glutIgnoreKeyRepeat( int ignore )
 {
-    fgState.IgnoreKeyRepeat = ignore ? TRUE : FALSE;
+    fgState.IgnoreKeyRepeat = ignore ? GL_TRUE : GL_FALSE;
 }
 
 /*
@@ -145,7 +145,7 @@ void FGAPIENTRY glutForceJoystickFunc( void )
 {
     freeglut_assert_ready;
     freeglut_return_if_fail( fgStructure.Window != NULL );
-    freeglut_return_if_fail( fgStructure.Window->Callbacks.Joystick != NULL );
+    freeglut_return_if_fail( FETCH_WCB( *( fgStructure.Window ), Joystick ) );
     fgJoystickPollWindow( fgStructure.Window );
 }