X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_init.c;h=c3c00e56e3ea6b32dbd2f17a8a651fdebe6891f7;hb=f4b802a47ef27c25a283a68932956fb7898771f1;hp=a408bbe92aa91007634f848c5cc537924a7b3b27;hpb=4941da223c8a1e2819d968c97fa31abb118fda87;p=freeglut

diff --git a/src/fg_init.c b/src/fg_init.c
index a408bbe..c3c00e5 100644
--- a/src/fg_init.c
+++ b/src/fg_init.c
@@ -681,7 +681,7 @@ void FGAPIENTRY glutInitErrorFuncUcall( FGErrorUC callback, FGCBUserData userDat
     fgState.ErrorFuncData = userData;
 }
 
-static void glutInitErrorFuncCallback( 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 );
@@ -689,10 +689,14 @@ static void glutInitErrorFuncCallback( const char *fmt, va_list ap, FGCBUserData
 
 void FGAPIENTRY glutInitErrorFunc( FGError callback )
 {
-  if (callback)
-    glutInitErrorFuncUcall( glutInitErrorFuncCallback, (FGCBUserData)callback );
-  else
-    glutInitErrorFuncUcall( NULL, NULL );
+	if (callback)
+	{
+		glutInitErrorFuncUcall( fghInitErrorFuncCallback, (FGCBUserData)callback );
+	}
+	else
+	{
+		glutInitErrorFuncUcall( NULL, NULL );
+	}
 }
 
 /*
@@ -705,7 +709,7 @@ void FGAPIENTRY glutInitWarningFuncUcall( FGWarningUC callback, FGCBUserData use
     fgState.WarningFuncData = userData;
 }
 
-static void glutInitWarningFuncCallback( 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 );
@@ -713,10 +717,14 @@ static void glutInitWarningFuncCallback( const char *fmt, va_list ap, FGCBUserDa
 
 void FGAPIENTRY glutInitWarningFunc( FGWarning callback )
 {
-  if (callback)
-    glutInitWarningFuncUcall( glutInitWarningFuncCallback, (FGCBUserData)callback );
-  else
-    glutInitWarningFuncUcall( NULL, NULL );
+	if (callback)
+	{
+		glutInitWarningFuncUcall( fghInitWarningFuncCallback, (FGCBUserData)callback );
+	}
+	else
+	{
+		glutInitWarningFuncUcall( NULL, NULL );
+	}
 }
 
 /*** END OF FILE ***/