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

[flightgear.git] / Time / fg_time.c

diff --git a/Time/fg_time.c b/Time/fg_time.c
index 8018b6348398ff254948844de1a47b23842a6c22..669c68faaa7db4730aa280a8a5002e7655a1120e 100644 (file)
--- a/Time/fg_time.c
+++ b/Time/fg_time.c
@@ -36,10 +36,9 @@
 #  include <sys/time.h>  /* for get/setitimer, gettimeofday, struct timeval */
 #endif /* USE_FTIME */
 
-#include "fg_time.h"
-#include "../Include/constants.h"
-#include "../Flight/flight.h"
-#include "../Time/fg_time.h"
+#include <Time/fg_time.h>
+#include <Include/constants.h>
+#include <Flight/flight.h>
 
 
 #define DEGHR(x)        ((x)/15.)
@@ -57,7 +56,7 @@ void fgTimeInit(struct fgTIME *t) {
 
     t->gst_diff = -9999.0;
     t->warp = 0;
-    t->warp = 5 * 3600;
+    t->warp = 0 * 3600;
     t->warp_delta = 0;
 }
 
@@ -167,9 +166,12 @@ double sidereal_course(struct tm *gmt, time_t now, double lng) {
 
 #ifdef USE_FTIME
     struct timeb current;
+#endif /* USE_FTIME */
+
+#ifdef WIN32
     int daylight;
     long int timezone;
-#endif /* USE_FTIME */
+#endif /* WIN32 */
 
     /*
     printf("  COURSE: GMT = %d/%d/%2d %d:%02d:%02d\n", 
@@ -298,10 +300,17 @@ void fgTimeUpdate(struct fgFLIGHT *f, struct fgTIME *t) {
 
 
 /* $Log$
-/* Revision 1.27  1998/01/13 00:23:13  curt
-/* Initial changes to support loading and management of scenery tiles.  Note,
-/* there's still a fair amount of work left to be done.
+/* Revision 1.29  1998/01/19 19:27:20  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.28  1998/01/19 18:35:49  curt
+ * Minor tweaks and fixes for cygwin32.
+ *
+ * Revision 1.27  1998/01/13 00:23:13  curt
+ * Initial changes to support loading and management of scenery tiles.  Note,
+ * there's still a fair amount of work left to be done.
+ *
  * Revision 1.26  1998/01/05 18:44:36  curt
  * Add an option to advance/decrease time from keyboard.
  *