X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_init.c;h=0c3e6974fa138438090259fc184252452b3adb91;hb=1e8083fc365a6e05ed3b6b3be467af41d13085d0;hp=27abc460ceb66fa5591e2e2aec107dbbac42b8ee;hpb=76169d74298feb3c4976af3f0f10376f56aec38d;p=freeglut

diff --git a/src/Common/freeglut_init.c b/src/Common/freeglut_init.c
index 27abc46..0c3e697 100644
--- a/src/Common/freeglut_init.c
+++ b/src/Common/freeglut_init.c
@@ -44,7 +44,7 @@
 /* -- GLOBAL VARIABLES ----------------------------------------------------- */
 
 /*
- * A structure pointed by g_pDisplay holds all information
+ * A structure pointed by fgDisplay holds all information
  * regarding the display, screen, root window etc.
  */
 SFG_Display fgDisplay;
@@ -314,26 +314,12 @@ 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 -------------------------------------------------- */
 
+#if !TARGET_HOST_POSIX_X11
+#include "Common/xparsegeometry_repl.h"
+#endif
+
 /*
  * Perform initialization. This usually happens on the program startup
  * and restarting after glutMainLoop termination...
@@ -368,7 +354,7 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
     fgPlatformInitialize( displayName );
 
     /*
-     * Geometry parsing deffered until here because we may need the screen
+     * Geometry parsing deferred until here because we may need the screen
      * size.
      */