X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_ext.c;h=ff13adc798ea509add8b1498056f89a4503b8090;hb=c24efb9241080a043193b67c6a9718312fed8d07;hp=cf2f4f932264ce8529846ed6ef2c360b567b265c;hpb=d67937396dc33c86017012859b2d9ed010fc6c88;p=freeglut diff --git a/src/freeglut_ext.c b/src/freeglut_ext.c index cf2f4f9..ff13adc 100644 --- a/src/freeglut_ext.c +++ b/src/freeglut_ext.c @@ -25,16 +25,10 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #define GLX_GLXEXT_PROTOTYPES - #include #include "freeglut_internal.h" - struct name_address_pair { const char *name; @@ -113,7 +107,7 @@ static struct name_address_pair glut_functions[] = { "glutSpecialUpFunc", (void *) glutSpecialUpFunc }, #if !TARGET_HOST_WINCE { "glutJoystickFunc", (void *) glutJoystickFunc }, -#endif //TARGET_HOST_WINCE +#endif /* !TARGET_HOST_WINCE */ { "glutSetColor", (void *) glutSetColor }, { "glutGetColor", (void *) glutGetColor }, { "glutCopyColormap", (void *) glutCopyColormap }, @@ -160,7 +154,7 @@ static struct name_address_pair glut_functions[] = { "glutEnterGameMode", (void *) glutEnterGameMode }, { "glutLeaveGameMode", (void *) glutLeaveGameMode }, { "glutGameModeGet", (void *) glutGameModeGet }, -#endif //TARGET_HOST_WINCE +#endif /* !TARGET_HOST_WINCE */ /* freeglut extensions */ { "glutMainLoopEvent", (void *) glutMainLoopEvent }, { "glutLeaveMainLoop", (void *) glutLeaveMainLoop }, @@ -190,6 +184,7 @@ void *FGAPIENTRY glutGetProcAddress( const char *procName ) { /* Try GLUT functions first */ int i; + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetProcAddress" ); for( i = 0; glut_functions[ i ].name; i++ ) if( strcmp( glut_functions[ i ].name, procName ) == 0) return glut_functions[ i ].address;