From fc98e7c77fdb427eab9de022cff9e149d6737971 Mon Sep 17 00:00:00 2001
From: "John F. Fay" <johnffay@nettally.com>
Date: Tue, 26 Apr 2005 17:44:57 +0000
Subject: [PATCH] Fixing the typecasts on the callback fetches and invocations
 to allow \"freeglut\" to compile with GCC 4.0

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@584 7f0cb862-5218-0410-a997-914c9d46530a
---
 src/freeglut_internal.h  |   21 +++++++++++++++++----
 src/freeglut_structure.c |    2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index cddae4e..0226214 100644
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -403,7 +403,7 @@ do                                                             \
  * type.
  */
 #define FETCH_WCB(window,cbname) \
-    ((FGCB ## cbname)((window).CallBacks[CB_ ## cbname]))
+    ((window).CallBacks[CB_ ## cbname])
 
 /*
  * INVOKE_WCB() is used as:
@@ -424,15 +424,28 @@ do                                                             \
  * current window.
  *
  */
+#if TARGET_HOST_WIN32
 #define INVOKE_WCB(window,cbname,arg_list)    \
 do                                            \
 {                                             \
     if( FETCH_WCB( window, cbname ) )         \
     {                                         \
+        FGCB ## cbname func = (FGCB ## cbname)(FETCH_WCB( window, cbname )); \
         fgSetWindow( &window );               \
-        FETCH_WCB( window, cbname ) arg_list; \
+        func arg_list;                        \
     }                                         \
 } while( 0 )
+#else
+#define INVOKE_WCB(window,cbname,arg_list)    \
+do                                            \
+{                                             \
+    if( FETCH_WCB( window, cbname ) )         \
+    {                                         \
+        fgSetWindow( &window );               \
+        ((FGCB ## cbname)FETCH_WCB( window, cbname )) arg_list; \
+    }                                         \
+} while( 0 )
+#endif
 
 /*
  * The window callbacks the user can supply us with. Should be kept portable.
@@ -570,7 +583,7 @@ struct tagSFG_Structure
     SFG_List        WindowsToDestroy;
 
     SFG_Window*     CurrentWindow; /* The currently set window          */
-    SFG_Menu*       CurrentMenu;  /* Same, but menu...                  */
+    SFG_Menu*       CurrentMenu;   /* Same, but menu...                 */
 
     SFG_MenuContext* MenuContext; /* OpenGL rendering context for menus */
 
@@ -693,7 +706,7 @@ extern SFG_State fgState;
  * window set, respectively:
  */
 #define  FREEGLUT_EXIT_IF_NO_WINDOW( string )                   \
-  if ( ! fgStructure.CurrentWindow )                                   \
+  if ( ! fgStructure.CurrentWindow )                            \
   {                                                             \
     fgError ( " ERROR:  Function <%s> called"                   \
               " with no current window defined.", (string) ) ;  \
diff --git a/src/freeglut_structure.c b/src/freeglut_structure.c
index d3f9f05..ecb4f10 100644
--- a/src/freeglut_structure.c
+++ b/src/freeglut_structure.c
@@ -165,7 +165,7 @@ void fgAddToWindowDestroyList( SFG_Window* window )
      * to ensure that they are no longer called after this point.
      */
     {
-        FGCBDestroy destroy = FETCH_WCB( *window, Destroy );
+        FGCBDestroy destroy = (FGCBDestroy)FETCH_WCB( *window, Destroy );
         fghClearCallBacks( window );
         SET_WCB( *window, Destroy, destroy );
     }
-- 
1.7.10.4