X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_callbacks.c;h=d7c998a00061a19c1e637d5f27a57adeb0ec1733;hb=69f96533fcedaf91c2b6c53da6e1c20fb145b425;hp=00d7ba17f8bf10181182f95cde8b37091ec6a82a;hpb=63515472d707c910e1172ff53d90dcf34f128599;p=freeglut

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index 00d7ba1..d7c998a 100644
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 
@@ -41,7 +41,7 @@
 #define SET_CALLBACK(a)              \
     if( fgStructure.Window == NULL ) \
         return;                      \
-    FETCH_WCB( ( *( fgStructure.Window ) ), a ) = callback;
+    SET_WCB( ( *( fgStructure.Window ) ), a, callback );
 
 /*
  * Sets the Display callback for the current window
@@ -52,7 +52,6 @@ void FGAPIENTRY glutDisplayFunc( void (* callback)( void ) )
         fgError( "Fatal error in program.  NULL display callback not "
                  "permitted in GLUT 3.0+ or freeglut 2.0.1+\n" );
     SET_CALLBACK( Display );
-    fgStructure.Window->State.Redisplay = GL_TRUE;
 }
 
 /*
@@ -129,7 +128,7 @@ void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ),
 static void fghVisibility( int status )
 {
     int glut_status = GLUT_VISIBLE;
-    
+
     freeglut_assert_ready;
     freeglut_return_if_fail( fgStructure.Window );