From 38364b19528622d04218b34c89c85d85c2f0591a Mon Sep 17 00:00:00 2001
From: Rcmaniac25 <rcmaniac25@hotmail.com>
Date: Sat, 16 Jan 2016 13:17:07 -0500
Subject: [PATCH] More explicit argument list for INVOKE_WCB callbacks

---
 freeglut/freeglut/src/fg_internal.h | 15 +++++++++++----
 freeglut/freeglut/src/fg_main.c     |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/freeglut/freeglut/src/fg_internal.h b/freeglut/freeglut/src/fg_internal.h
index 8262a9f..ccba1d0 100644
--- a/freeglut/freeglut/src/fg_internal.h
+++ b/freeglut/freeglut/src/fg_internal.h
@@ -714,7 +714,13 @@ do                                                             \
  * typedef void (* FGCBEntryUC)( int, FGCBUserData );
  * #define EXPAND_WCB_SUB_Entry(args, userData) EXPAND_WCB_ONE_OR_MORE(args, userData)
  */
+#define FG_COMPILER_SUPPORTS_VA_ARGS
+#ifdef FG_COMPILER_SUPPORTS_VA_ARGS
 #define EXPAND_WCB_UNPARAN(...) __VA_ARGS__
+#else
+#error "Compiler does not support varadic argument macros"
+#endif
+
 #define EXPAND_WCB_ZERO(args, userData) ( userData )
 #define EXPAND_WCB_ONE_OR_MORE(args, userData) ( EXPAND_WCB_UNPARAN args, userData )
 
@@ -732,9 +738,10 @@ do                                                             \
  *
  * The callback is invoked as:
  *
- *    callback( arg_list );
+ *    callback( arg_list, userData );
  *
- * ...so the parentheses are REQUIRED in the {arg_list}.
+ * ...where userData is added to the arg_list, but the parentheses 
+ * are REQUIRED in the {arg_list}.
  *
  * NOTE that it does a sanity-check and also sets the
  * current window.
@@ -749,7 +756,7 @@ do                                            \
         FGCB ## cbname ## UC func = (FGCB ## cbname ## UC)(FETCH_WCB( window, cbname )); \
         FGCBUserData userData = FETCH_USER_DATA_WCB( window, cbname ); \
         fgSetWindow( &window );               \
-        func EXPAND_WCB( cbname )( arg_list, userData ); \
+		func EXPAND_WCB( cbname )( arg_list, userData ); \
     }                                         \
 } while( 0 )
 #else
@@ -760,7 +767,7 @@ do                                            \
     {                                         \
         fgSetWindow( &window );               \
         FGCBUserData userData = FETCH_USER_DATA_WCB( window, cbname ); \
-        ((FGCB ## cbname ## UC)FETCH_WCB( window, cbname )) EXPAND_WCB( cbname )( arg_list, userData ); \
+		((FGCB ## cbname ## UC)FETCH_WCB( window, cbname )) EXPAND_WCB( cbname )( arg_list, userData ); \
     }                                         \
 } while( 0 )
 #endif
diff --git a/freeglut/freeglut/src/fg_main.c b/freeglut/freeglut/src/fg_main.c
index 9b992e9..b10d8dd 100644
--- a/freeglut/freeglut/src/fg_main.c
+++ b/freeglut/freeglut/src/fg_main.c
@@ -400,7 +400,7 @@ void fgProcessWork(SFG_Window *window)
             fgPlatformInitWork(window);
 
             /* Call init context callback */
-            INVOKE_WCB( *window, InitContext, ());
+            INVOKE_WCB( *window, InitContext, ( ) );
 
             /* Lastly, check if we have a display callback, error out if not
              * This is the right place to do it, as the redisplay will be