FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More explicit argument list for INVOKE_WCB callbacks

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1811 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2017-06-30 23:21:21 +00:00
parent da0b7b3369
commit f0150de08d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
freeglut/freeglut/src/fg_internal.h
View File

@ -713,7 +713,13 @@ do \
* typedef void (* FGCBEntryUC)( int, FGCBUserData ); * typedef void (* FGCBEntryUC)( int, FGCBUserData );
* #define EXPAND_WCB_SUB_Entry(args, userData) EXPAND_WCB_ONE_OR_MORE(args, userData) * #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__ #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_ZERO(args, userData) ( userData )
#define EXPAND_WCB_ONE_OR_MORE(args, userData) ( EXPAND_WCB_UNPARAN args, userData ) #define EXPAND_WCB_ONE_OR_MORE(args, userData) ( EXPAND_WCB_UNPARAN args, userData )
@ -731,9 +737,10 @@ do \
* *
* The callback is invoked as: * 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 * NOTE that it does a sanity-check and also sets the
* current window. * current window.
@ -748,7 +755,7 @@ do \
FGCB ## cbname ## UC func = (FGCB ## cbname ## UC)(FETCH_WCB( window, cbname )); \ FGCB ## cbname ## UC func = (FGCB ## cbname ## UC)(FETCH_WCB( window, cbname )); \
FGCBUserData userData = FETCH_USER_DATA_WCB( window, cbname ); \ FGCBUserData userData = FETCH_USER_DATA_WCB( window, cbname ); \
fgSetWindow( &window ); \ fgSetWindow( &window ); \
func EXPAND_WCB( cbname )( arg_list, userData ); \ func EXPAND_WCB( cbname )( arg_list, userData ); \
} \ } \
} while( 0 ) } while( 0 )
#else #else
@ -759,7 +766,7 @@ do \
{ \ { \
fgSetWindow( &window ); \ fgSetWindow( &window ); \
FGCBUserData userData = FETCH_USER_DATA_WCB( window, cbname ); \ 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 ) } while( 0 )
#endif #endif

2
freeglut/freeglut/src/fg_main.c
View File

@ -400,7 +400,7 @@ void fgProcessWork(SFG_Window *window)
fgPlatformInitWork(window); fgPlatformInitWork(window);
/* Call init context callback */ /* Call init context callback */
INVOKE_WCB( *window, InitContext, ()); INVOKE_WCB( *window, InitContext, ( ) );
/* Lastly, check if we have a display callback, error out if not /* 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 * This is the right place to do it, as the redisplay will be