Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / Time / fg_timer.c

diff --git a/Time/fg_timer.c b/Time/fg_timer.c
index 6e1a8a3fb550497a43e99027aa55bdb78af34562..db9d477e7f6f807988cd82ae2ffcd7f1744dfa95 100644 (file)
--- a/Time/fg_timer.c
+++ b/Time/fg_timer.c
@@ -33,7 +33,7 @@
 #  include <sys/time.h>  /* for get/setitimer, gettimeofday, struct timeval */
 #endif /* USE_FTIME */
 
-#include "fg_timer.h"
+#include <Time/fg_timer.h>
 
 
 unsigned long int fgSimTime;
@@ -44,7 +44,7 @@ unsigned long int fgSimTime;
 
 
 /* This routine catches the SIGALRM */
-void fgTimerCatch() {
+void fgTimerCatch( void ) {
     /* ignore any SIGALRM's until we come back from our EOM iteration */
     signal(SIGALRM, SIG_IGN);
 
@@ -87,7 +87,7 @@ void fgTimerInit(float dt, void (*f)()) {
 
 /* This function returns the number of milleseconds since the last
    time it was called. */
-int fgGetTimeInterval() {
+int fgGetTimeInterval( void ) {
     int interval;
     static int inited = 0;
 
@@ -131,9 +131,17 @@ int fgGetTimeInterval() {
 
 
 /* $Log$
-/* Revision 1.7  1997/12/30 13:06:58  curt
-/* A couple lighting tweaks ...
+/* Revision 1.9  1998/01/19 19:27:21  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.8  1998/01/19 18:40:39  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.7  1997/12/30 13:06:58  curt
+ * A couple lighting tweaks ...
+ *
  * Revision 1.6  1997/07/12 02:13:04  curt
  * Add ftime() support for those that don't have gettimeofday()
  *