projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed warnings on Linux where GCC under padantic complained ISO C casting wasn't...
[freeglut]
/
src
/
fg_init.c
diff --git
a/src/fg_init.c
b/src/fg_init.c
index
ed29a83
..
b8a38f7
100644
(file)
--- a/
src/fg_init.c
+++ b/
src/fg_init.c
@@
-683,15
+683,16
@@
void FGAPIENTRY glutInitErrorFuncUcall( FGErrorUC callback, FGCBUserData userDat
static void fghInitErrorFuncCallback( const char *fmt, va_list ap, FGCBUserData userData )
{
static void fghInitErrorFuncCallback( const char *fmt, va_list ap, FGCBUserData userData )
{
- FGError callback = (FGError)userData;
- callback( fmt, ap );
+ FGError* callback = (FGError*)&userData;
+ (*callback)( fmt, ap );
}
void FGAPIENTRY glutInitErrorFunc( FGError callback )
{
if (callback)
{
}
void FGAPIENTRY glutInitErrorFunc( FGError callback )
{
if (callback)
{
- glutInitErrorFuncUcall( fghInitErrorFuncCallback, (FGCBUserData)callback );
+ FGError* reference = &callback;
+ glutInitErrorFuncUcall( fghInitErrorFuncCallback, *((FGCBUserData*)reference) );
}
else
{
}
else
{
@@
-711,15
+712,16
@@
void FGAPIENTRY glutInitWarningFuncUcall( FGWarningUC callback, FGCBUserData use
static void fghInitWarningFuncCallback( const char *fmt, va_list ap, FGCBUserData userData )
{
static void fghInitWarningFuncCallback( const char *fmt, va_list ap, FGCBUserData userData )
{
- FGWarning callback = (FGWarning)userData;
- callback( fmt, ap );
+ FGWarning* callback = (FGWarning*)&userData;
+ (*callback)( fmt, ap );
}
void FGAPIENTRY glutInitWarningFunc( FGWarning callback )
{
if (callback)
{
}
void FGAPIENTRY glutInitWarningFunc( FGWarning callback )
{
if (callback)
{
- glutInitWarningFuncUcall( fghInitWarningFuncCallback, (FGCBUserData)callback );
+ FGWarning* reference = &callback;
+ glutInitWarningFuncUcall( fghInitWarningFuncCallback, *((FGCBUserData*)reference) );
}
else
{
}
else
{