Splitting the X11-specific "freeglut_ext.c" code into its own file

[freeglut] / src / Common / freeglut_ext.c

diff --git a/src/Common/freeglut_ext.c b/src/Common/freeglut_ext.c
index 49ff88b..3c3c127 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
@@ -203,42 +203,6 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
 }\r
 \r
 \r
-#if TARGET_HOST_POSIX_X11\r
-static GLUTproc fghGetGLUTProcAddress( const char* procName )\r
-{\r
-    /* optimization: quick initial check */\r
-    if( strncmp( procName, "glut", 4 ) != 0 )\r
-        return NULL;\r
-\r
-#define CHECK_NAME(x) if( strcmp( procName, #x ) == 0) return (GLUTproc)x;\r
-    CHECK_NAME(glutJoystickFunc);\r
-    CHECK_NAME(glutForceJoystickFunc);\r
-    CHECK_NAME(glutGameModeString);\r
-    CHECK_NAME(glutEnterGameMode);\r
-    CHECK_NAME(glutLeaveGameMode);\r
-    CHECK_NAME(glutGameModeGet);\r
-#undef CHECK_NAME\r
-\r
-    return NULL;\r
-}\r
-\r
-\r
-GLUTproc fgPlatformGlutGetProcAddress( const char* procName )\r
-{\r
-    return NULL;\r
-}\r
-\r
-\r
-SFG_Proc fghGetProcAddress( const char *procName )\r
-{\r
-#if defined( GLX_ARB_get_proc_address )\r
-    return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );\r
-#else\r
-    return NULL;\r
-#endif\r
-}\r
-#endif\r
-\r
 \r
 GLUTproc FGAPIENTRY\r
 glutGetProcAddress( const char *procName )\r
@@ -251,7 +215,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