Fixing the "glutGetProcAddress" snafu -- thank you, Evan Felix, for finding this

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1040 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/Common/freeglut_ext.c b/src/Common/freeglut_ext.c
index 49ff88b..917839a 100644 (file)
--- a/src/Common/freeglut_ext.c
+++ b/src/Common/freeglut_ext.c
@@ -29,8 +29,8 @@
 #include <GL/freeglut.h>\r
 #include "freeglut_internal.h"\r
 \r
-extern SFG_Proc fghGetProcAddress( const char *procName );\r
-extern GLUTproc fgPlatformGlutGetProcAddress( const char *procName );\r
+extern SFG_Proc fgPlatformGetProcAddress( const char *procName );\r
+extern GLUTproc fgPlatformGetGLUTProcAddress( const char *procName );\r
 \r
 static GLUTproc fghGetGLUTProcAddress( const char* procName )\r
 {\r
@@ -204,7 +204,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
 \r
 \r
 #if TARGET_HOST_POSIX_X11\r
-static GLUTproc fghGetGLUTProcAddress( const char* procName )\r
+static GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )\r
 {\r
     /* optimization: quick initial check */\r
     if( strncmp( procName, "glut", 4 ) != 0 )\r
@@ -223,13 +223,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
 }\r
 \r
 \r
-GLUTproc fgPlatformGlutGetProcAddress( const char* procName )\r
-{\r
-    return NULL;\r
-}\r
-\r
-\r
-SFG_Proc fghGetProcAddress( const char *procName )\r
+SFG_Proc fgPlatformGetProcAddress( const char *procName )\r
 {\r
 #if defined( GLX_ARB_get_proc_address )\r
     return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );\r
@@ -251,7 +245,7 @@ glutGetProcAddress( const char *procName )
 \r
        /* Some GLUT functions are platform-specific: */\r
        if ( !p )\r
-      p = fgPlatformGlutGetProcAddress( procName );\r
+      p = fgPlatformGetGLUTProcAddress( procName );\r
 \r
-    return ( p != NULL ) ? p : fghGetProcAddress( procName );\r
+    return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName );\r
 }\r

diff --git a/src/mswin/freeglut_ext_mswin.c b/src/mswin/freeglut_ext_mswin.c
index c08c840..6b09f9d 100644 (file)
--- a/src/mswin/freeglut_ext_mswin.c
+++ b/src/mswin/freeglut_ext_mswin.c
@@ -28,7 +28,7 @@
 #include <GL/freeglut.h>\r
 #include "../Common/freeglut_internal.h"\r
 \r
-GLUTproc fgPlatformGlutGetProcAddress( const char* procName )\r
+GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )\r
 {\r
 #if !defined(_WIN32_WCE)\r
     /* optimization: quick initial check */\r
@@ -50,7 +50,7 @@ GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
 \r
 \r
 \r
-SFG_Proc fghGetProcAddress( const char *procName )\r
+SFG_Proc fgPlatformGetProcAddress( const char *procName )\r
 {\r
     return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName );\r
 }\r