X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_main.c;h=885ed457b818849cc9016c29e2500e84fba0e2b1;hb=9a1ee9315ae988fd16d4360fe99aa562de6a94ba;hp=b664fa3ebc15b7b6949c56b75ada0c7794dcb967;hpb=b23128a3f3779555ea461278346d628a9b49fad0;p=freeglut

diff --git a/src/fg_main.c b/src/fg_main.c
index b664fa3..885ed45 100644
--- a/src/fg_main.c
+++ b/src/fg_main.c
@@ -103,10 +103,8 @@ static void fghReshapeWindow ( SFG_Window *window, int width, int height )
 void fghRedrawWindow ( SFG_Window *window )
 {
     SFG_Window *current_window = fgStructure.CurrentWindow;
-    printf("fghRedrawWindow\n");
 
     freeglut_return_if_fail( window );
-    printf("got window\n");
 
     if( window->State.NeedToInitContext ) {
         INVOKE_WCB( *window, InitContext, ());
@@ -114,12 +112,10 @@ void fghRedrawWindow ( SFG_Window *window )
     }
 
     freeglut_return_if_fail( FETCH_WCB ( *window, Display ) );
-    printf("got displayCB\n");
 
     window->State.Redisplay = GL_FALSE;
 
     freeglut_return_if_fail( window->State.Visible );
-    printf("we're visible\n");
 
     fgSetWindow( window );
 
@@ -138,7 +134,6 @@ void fghRedrawWindow ( SFG_Window *window )
         );
     }
 
-    printf("invoking displayCB\n");
     INVOKE_WCB( *window, Display, ( ) );
 
     fgSetWindow( current_window );
@@ -148,12 +143,10 @@ void fghRedrawWindow ( SFG_Window *window )
 static void fghcbDisplayWindow( SFG_Window *window,
                                 SFG_Enumerator *enumerator )
 {
-    printf("window %p, %i\n",window,window->State.Redisplay);
     if( window->State.Redisplay &&
         window->State.Visible )
     {
         window->State.Redisplay = GL_FALSE;
-        printf("redisplaying...\n");
 		fgPlatformDisplayWindow ( window );
     }
 
@@ -231,12 +224,8 @@ static void fghCheckTimers( void )
 /* Platform-dependent time in milliseconds, as an unsigned 64-bit integer.
  * This doesn't overflow in any reasonable time, so no need to worry about
  * that. The GLUT API return value will however overflow after 49.7 days,
- * and on Windows we (currently) do not have access to a 64-bit timestamp,
- * which means internal time will still get in trouble when running the
+ * which means you will still get in trouble when running the
  * application for more than 49.7 days.
- * This value wraps every 49.7 days, but integer overflows cancel
- * when subtracting an initial start time, unless the total time exceeds
- * 32-bit, where the GLUT API return value is also overflowed.
  */  
 fg_time_t fgSystemTime(void)
 {
@@ -268,7 +257,7 @@ void fgError( const char *fmt, ... )
         va_end( ap );
 
     } else {
-
+#if FREEGLUT_ERRORS
         va_start( ap, fmt );
 
         fprintf( stderr, "freeglut ");
@@ -278,6 +267,7 @@ void fgError( const char *fmt, ... )
         fprintf( stderr, "\n" );
 
         va_end( ap );
+#endif
 
         if ( fgState.Initialised )
             fgDeinitialize ();
@@ -300,7 +290,7 @@ void fgWarning( const char *fmt, ... )
         va_end( ap );
 
     } else {
-
+#if FREEGLUT_WARNINGS
         va_start( ap, fmt );
 
         fprintf( stderr, "freeglut ");
@@ -310,6 +300,7 @@ void fgWarning( const char *fmt, ... )
         fprintf( stderr, "\n" );
 
         va_end( ap );
+#endif
     }
 }