Addressing bug report 3368139 about warnings under OpenSUSE. I added two explicit...

[freeglut] / src / freeglut_ext.c

diff --git a/src/freeglut_ext.c b/src/freeglut_ext.c
index 6e4f693..d8aca45 100644 (file)
--- a/src/freeglut_ext.c
+++ b/src/freeglut_ext.c
@@ -29,7 +29,7 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
-static GLUTproc fghGetProcAddress( const char* procName )
+static GLUTproc fghGetGLUTProcAddress( const char* procName )
 {
     /* optimization: quick initial check */
     if( strncmp( procName, "glut", 4 ) != 0 )
@@ -85,6 +85,10 @@ static GLUTproc fghGetProcAddress( const char* procName )
     CHECK_NAME(glutReshapeFunc);
     CHECK_NAME(glutKeyboardFunc);
     CHECK_NAME(glutMouseFunc);
+    CHECK_NAME(glutMultiEntryFunc);
+    CHECK_NAME(glutMultiMotionFunc);
+    CHECK_NAME(glutMultiButtonFunc);
+    CHECK_NAME(glutMultiPassiveFunc);
     CHECK_NAME(glutMotionFunc);
     CHECK_NAME(glutPassiveMotionFunc);
     CHECK_NAME(glutEntryFunc);
@@ -162,6 +166,7 @@ static GLUTproc fghGetProcAddress( const char* procName )
     CHECK_NAME(glutWMCloseFunc);
     CHECK_NAME(glutMenuDestroyFunc);
     CHECK_NAME(glutFullScreenToggle);
+    CHECK_NAME(glutLeaveFullScreen);
     CHECK_NAME(glutSetOption);
     CHECK_NAME(glutGetModeValues);
     CHECK_NAME(glutSetWindowData);
@@ -193,29 +198,36 @@ static GLUTproc fghGetProcAddress( const char* procName )
     CHECK_NAME(glutJoystickGetMinRange);
     CHECK_NAME(glutJoystickGetMaxRange);
     CHECK_NAME(glutJoystickGetCenter);
+    CHECK_NAME(glutInitContextVersion);
+    CHECK_NAME(glutInitContextFlags);
+    CHECK_NAME(glutInitContextProfile);
+    CHECK_NAME(glutInitErrorFunc);
+    CHECK_NAME(glutInitWarningFunc);
 #undef CHECK_NAME
 
     return NULL;
 }
 
 
-GLUTproc FGAPIENTRY
-glutGetProcAddress( const char *procName )
+SFG_Proc fghGetProcAddress( const char *procName )
 {
-    GLUTproc p;
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetProcAddress" );
-
-    /* Try GLUT functions first */
-    p = fghGetProcAddress( procName );
-    if( p != NULL )
-        return p;
-
-    /* Try core GL functions */
 #if TARGET_HOST_MS_WINDOWS
-    return(GLUTproc)wglGetProcAddress( ( LPCSTR )procName );
+    return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName );
 #elif TARGET_HOST_POSIX_X11 && defined( GLX_ARB_get_proc_address )
-    return(GLUTproc)glXGetProcAddressARB( ( const GLubyte * )procName );
+    return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );
 #else
     return NULL;
 #endif
 }
+
+
+GLUTproc FGAPIENTRY
+glutGetProcAddress( const char *procName )
+{
+    GLUTproc p;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetProcAddress" );
+
+    /* Try GLUT functions first, then core GL functions */
+    p = fghGetGLUTProcAddress( procName );
+    return ( p != NULL ) ? p : fghGetProcAddress( procName );
+}