X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_misc.c;h=2af17313ae1e59750ced2ecb90d1e0170dd3d0dc;hb=02d1360233aa5a71d0f46fda6c6956c5122fad80;hp=5891f4ca89abce8771e391c5f3ddadfda2191c76;hpb=a32a8c7ca85608c26ae1ec061f4b855cfefe93a8;p=freeglut

diff --git a/src/freeglut_misc.c b/src/freeglut_misc.c
index 5891f4c..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;
 }
 
 /*
@@ -153,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 );
 }