X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_callbacks.c;h=2dd2232d53d67fe738b648533f0a54c76f94ab29;hb=4634982c39857ee13ad0c5fa67b3ad197a37daf1;hp=9ce8cfb2f202c11d7fe4d0ba55d0af07265f07ec;hpb=d296a46a2dccdd99048541e1f8ca0ef010ac8545;p=freeglut

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index 9ce8cfb..2dd2232 100644
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -25,23 +25,21 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
-
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
 /*
  * All of the callbacks setting methods can be generalized to this:
  */
-#define SET_CALLBACK(a)              \
-    if( fgStructure.Window == NULL ) \
-        return;                      \
-    SET_WCB( ( *( fgStructure.Window ) ), a, callback );
+#define SET_CALLBACK(a)                                  \
+do                                                       \
+{                                                        \
+    if( fgStructure.Window == NULL )                     \
+        return;                                          \
+    SET_WCB( ( *( fgStructure.Window ) ), a, callback ); \
+} while( 0 )
 
 /*
  * Sets the Display callback for the current window
@@ -133,6 +131,7 @@ static void fghVisibility( int status )
 {
     int glut_status = GLUT_VISIBLE;
 
+    FREEGLUT_INTERNAL_ERROR_EXIT_IF_NOT_INITIALISED ( "Visibility Callback" );
     freeglut_return_if_fail( fgStructure.Window );
 
     if( ( GLUT_HIDDEN == status )  || ( GLUT_FULLY_COVERED == status ) )