diff --git a/freeglut/freeglut/src/Common/freeglut_init.c b/freeglut/freeglut/src/Common/freeglut_init.c index 27abc46..823fab4 100644 --- a/freeglut/freeglut/src/Common/freeglut_init.c +++ b/freeglut/freeglut/src/Common/freeglut_init.c @@ -314,24 +314,6 @@ void fgDeinitialize( void ) } -#if TARGET_HOST_MS_WINDOWS -#define NoValue 0x0000 -#define XValue 0x0001 -#define YValue 0x0002 -#define WidthValue 0x0004 -#define HeightValue 0x0008 -#define AllValues 0x000F -#define XNegative 0x0010 -#define YNegative 0x0020 - -extern int XParseGeometry ( - const char *string, - int *x, - int *y, - unsigned int *width, /* RETURN */ - unsigned int *height); /* RETURN */ -#endif - /* -- INTERFACE FUNCTIONS -------------------------------------------------- */ /* diff --git a/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h b/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h index 37a77b4..d39d359 100644 --- a/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h +++ b/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h @@ -95,6 +95,25 @@ struct tagSFG_PlatformWindowState +/* For "freeglut_init.c", some definitions of symbols and a prototype to emulate the X11 functionality */ +#define NoValue 0x0000 +#define XValue 0x0001 +#define YValue 0x0002 +#define WidthValue 0x0004 +#define HeightValue 0x0008 +#define AllValues 0x000F +#define XNegative 0x0010 +#define YNegative 0x0020 + +extern int XParseGeometry ( + const char *string, + int *x, + int *y, + unsigned int *width, /* RETURN */ + unsigned int *height); /* RETURN */ + + + /* Joystick-Specific Definitions */ #if !defined(_WIN32_WCE) # define _JS_MAX_AXES 8