Implemented tetrahedra, octahedra, dodecahedra, and icosahedra. Checked in on behalf...

[freeglut] / freeglut-1.3 / freeglut_init.c

diff --git a/freeglut-1.3/freeglut_init.c b/freeglut-1.3/freeglut_init.c
index f781b43..abb5c01 100644 (file)
--- a/freeglut-1.3/freeglut_init.c
+++ b/freeglut-1.3/freeglut_init.c
@@ -163,7 +163,7 @@ void fgInitialize( const char* displayName )
      */
     if( atom == 0 )
     {
-        gboolean retval;
+        GLboolean retval;
 
         /*
          * Make sure the unitialized fields are reset to zero
@@ -188,7 +188,7 @@ void fgInitialize( const char* displayName )
          * Register the window class
          */
         retval = RegisterClass( &wc );
-        g_assert( retval != FALSE );
+        assert( retval != FALSE );
     }
 
     /*
@@ -349,7 +349,11 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
     /*
      * Remember the function's call time
      */
+#ifndef WIN32
     gettimeofday(&fgState.Time.Value, NULL);
+#else
+    fgState.Time.Value = timeGetTime();
+#endif
     fgState.Time.Set = TRUE;
 
     /*