projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing the "glutGetProcAddress" snafu -- thank you, Evan Felix, for finding this
[freeglut]
/
src
/
Common
/
freeglut_ext.c
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
#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
\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
\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
{
\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
}
\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
{
\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
\r
/* Some GLUT functions are platform-specific: */
\r
if ( !p )
\r
- p = fgPlatformGlutGetProcAddress( procName );
\r
+ p = fgPlatformGetGLUTProcAddress( procName );
\r
\r
\r
- return ( p != NULL ) ? p : fghGetProcAddress( procName );
\r
+ return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName );
\r
}
\r
}
\r