X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_ext.c;h=72bdaf90e6cc146d073945662b5cb32315ee9cd0;hb=dd8896ee63aa0a066b0d591989b2ffb72fd08563;hp=598edb69f50e4b632162f452330d6757dfe992d5;hpb=3e5e3f51c272a95dc877b781281880061690b935;p=freeglut diff --git a/src/Common/freeglut_ext.c b/src/Common/freeglut_ext.c index 598edb6..72bdaf9 100644 --- a/src/Common/freeglut_ext.c +++ b/src/Common/freeglut_ext.c @@ -29,8 +29,8 @@ #include #include "freeglut_internal.h" -extern SFG_Proc fghGetProcAddress( const char *procName ); -extern GLUTproc fgPlatformGlutGetProcAddress( const char *procName ); +extern SFG_Proc fgPlatformGetProcAddress( const char *procName ); +extern GLUTproc fgPlatformGetGLUTProcAddress( const char *procName ); static GLUTproc fghGetGLUTProcAddress( const char* procName ) { @@ -204,7 +204,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) #if TARGET_HOST_POSIX_X11 -static GLUTproc fghGetGLUTProcAddress( const char* procName ) +GLUTproc fgPlatformGetGLUTProcAddress( const char* procName ) { /* optimization: quick initial check */ if( strncmp( procName, "glut", 4 ) != 0 ) @@ -223,13 +223,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) } -static GLUTproc fgPlatformGlutGetProcAddress( const char* procName ) -{ - return NULL; -} - - -SFG_Proc fghGetProcAddress( const char *procName ) +SFG_Proc fgPlatformGetProcAddress( const char *procName ) { #if defined( GLX_ARB_get_proc_address ) return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName ); @@ -251,7 +245,7 @@ glutGetProcAddress( const char *procName ) /* Some GLUT functions are platform-specific: */ if ( !p ) - p = fgPlatformGlutGetProcAddress( procName ); + p = fgPlatformGetGLUTProcAddress( procName ); - return ( p != NULL ) ? p : fghGetProcAddress( procName ); + return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName ); }