X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffreeglut_misc.c;h=2af17313ae1e59750ced2ecb90d1e0170dd3d0dc;hb=98ea79ef777bea593a87aef9600ee3d4fda6e110;hp=3d1ce5bc4ba2a7f702ac90af324e7c966fd99dc5;hpb=b016ef6d7416bc9fbe1573627995c6ea903cdc10;p=freeglut

diff --git a/src/freeglut_misc.c b/src/freeglut_misc.c
index 3d1ce5b..2af1731 100644
--- a/src/freeglut_misc.c
+++ b/src/freeglut_misc.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-misc"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 
@@ -53,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
@@ -91,13 +89,7 @@ void FGAPIENTRY glutReportErrors( void )
 {
     GLenum error;
     while( ( error = glGetError() ) != GL_NO_ERROR )
-#       undef  G_LOG_DOMAIN
-#       define G_LOG_DOMAIN ((gchar *) 0)
-
         fgWarning( "GL error: %s", gluErrorString( error ) );
-
-#       undef   G_LOG_DOMAIN
-#       define  G_LOG_DOMAIN  "freeglut_misc.c"
 }
 
 /*
@@ -107,7 +99,7 @@ void FGAPIENTRY glutReportErrors( void )
  */
 void FGAPIENTRY glutIgnoreKeyRepeat( int ignore )
 {
-    fgState.IgnoreKeyRepeat = ignore ? TRUE : FALSE;
+    fgState.IgnoreKeyRepeat = ignore ? GL_TRUE : GL_FALSE;
 }
 
 /*
@@ -152,20 +144,8 @@ void FGAPIENTRY glutSetKeyRepeat( int repeatMode )
 void FGAPIENTRY glutForceJoystickFunc( void )
 {
     freeglut_assert_ready;
-
-    /*
-     * Is there a current window selected?
-     */
     freeglut_return_if_fail( fgStructure.Window != NULL );
-
-    /*
-     * Check if there is a joystick callback hooked to the current window
-     */
-    freeglut_return_if_fail( fgStructure.Window->Callbacks.Joystick != NULL );
-
-    /*
-     * Poll the joystick now, using the current window's joystick callback
-     */
+    freeglut_return_if_fail( FETCH_WCB( *( fgStructure.Window ), Joystick ) );
     fgJoystickPollWindow( fgStructure.Window );
 }