All changes are from John, except for:

[freeglut] / src / freeglut_state.c

diff --git a/src/freeglut_state.c b/src/freeglut_state.c
index 3c1ae79..5e4ad04 100644 (file)
--- a/src/freeglut_state.c
+++ b/src/freeglut_state.c
@@ -124,13 +124,15 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
  */
 int FGAPIENTRY glutGet( GLenum eWhat )
 {
+#if TARGET_HOST_WIN32
     int returnValue ;
     GLboolean boolValue ;
+#endif
 
     switch (eWhat)
     {
     case GLUT_INIT_STATE:
-        return ( fgState.Initalized ) ;
+        return ( fgState.Initialised ) ;
 
     case GLUT_ELAPSED_TIME:
         return( fgElapsedTime() );
@@ -562,16 +564,13 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat )
  */
 int FGAPIENTRY glutGetModifiers( void )
 {
-    if( fgStructure.Window == NULL )
-        return( 0 );
-
-    if( fgStructure.Window->State.Modifiers == 0xffffffff )
+    if( fgState.Modifiers == 0xffffffff )
     {
         fgWarning( "glutGetModifiers() called outside an input callback" );
         return( 0 );
     }
 
-    return( fgStructure.Window->State.Modifiers );
+    return( fgState.Modifiers );
 }
 
 /*