X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_ext.c;h=917839a6b5ddf09931edf265fcbc6550a87f5880;hb=50dea63211495f1d8302c25eb1acae51347d1502;hp=49ff88b131b22db9de53c32cef6553a5865fd329;hpb=474daf255eabd124b1023c199c3c7b98f242325c;p=freeglut diff --git a/src/Common/freeglut_ext.c b/src/Common/freeglut_ext.c index 49ff88b..917839a 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 ) +static 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 ) } -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 ); }