XParseGeometry include now compiles with windows (VS2010, didn't touch

[freeglut] / src / Common / freeglut_init.c

diff --git a/src/Common/freeglut_init.c b/src/Common/freeglut_init.c
index 823fab4..20073bb 100644 (file)
--- 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;
@@ -315,6 +315,9 @@ void fgDeinitialize( void )
 
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
+#if !TARGET_HOST_POSIX_X11
+#   include "../Common/xparsegeometry_repl.h"
+#endif
 
 /*
  * Perform initialization. This usually happens on the program startup
@@ -350,7 +353,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.
      */
 
@@ -495,7 +498,7 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
                      configuration is conformant or not */
             break ;
 
-        case 6 : /* "depth":  Number of bits of precsion in the depth buffer */
+        case 6 : /* "depth":  Number of bits of precision in the depth buffer */
             glut_state_flag |= GLUT_DEPTH ;  /* Somebody fix this for me! */
             break ;
 
@@ -615,8 +618,7 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
             break ;
 
         case 35 :  /* "borderless":  windows should not have borders */
-#if TARGET_HOST_POSIX_X11
-#endif
+            glut_state_flag |= GLUT_BORDERLESS;
             break ;
 
         case 36 :  /* "aux":  some number of aux buffers */
@@ -642,7 +644,7 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
 
 void FGAPIENTRY glutInitContextVersion( int majorVersion, int minorVersion )
 {
-    /* We will make use of these valuse when creating a new OpenGL context... */
+    /* We will make use of these value when creating a new OpenGL context... */
     fgState.MajorVersion = majorVersion;
     fgState.MinorVersion = minorVersion;
 }
@@ -680,4 +682,4 @@ void FGAPIENTRY glutInitWarningFunc( void (* vfgWarning) ( const char *fmt, va_l
     fgState.WarningFunc = vfgWarning;
 }
 
-/*** END OF FILE ***/
+/*** END OF FILE ***/
\ No newline at end of file