Doxygen ...

[simgear.git] / simgear / timing / sg_time.cxx

diff --git a/simgear/timing/sg_time.cxx b/simgear/timing/sg_time.cxx
index 3ee4bc9dc3f48a37420f6bcf30a42cfb0608135c..74d53c4fe2d73553947a806a074102430fb15fa0 100644 (file)
--- a/simgear/timing/sg_time.cxx
+++ b/simgear/timing/sg_time.cxx
@@ -28,7 +28,9 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_HAVE_STD_INCLUDES
+#include <errno.h>             // for errno
+
+#ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
 #  include <cstdio>
 #  include <cstdlib>
@@ -60,7 +62,7 @@
 
 
 #define DEGHR(x)        ((x)/15.)
-#define RADHR(x)        DEGHR(x*RAD_TO_DEG)
+#define RADHR(x)        DEGHR(x*SGD_RADIANS_TO_DEGREES)
 
 
 static const double MJD0    = 2415020.0;
@@ -87,7 +89,7 @@ SGTime::SGTime( double lon, double lat, const string& root )
                << zone.str() );
        tzContainer = new TimezoneContainer( zone.c_str() );
 
-       GeoCoord location( RAD_TO_DEG * lat, RAD_TO_DEG * lon );
+       GeoCoord location( SGD_RADIANS_TO_DEGREES * lat, SGD_RADIANS_TO_DEGREES * lon );
        GeoCoord* nearestTz = tzContainer->getNearest(location);
 
        FGPath name( root );
@@ -133,7 +135,7 @@ static double sidereal_precise( double mjd, double lng )
        mjd + MJD0, lng); */
 
     // convert to required internal units
-    lng *= DEG_TO_RAD;
+    lng *= SGD_DEGREES_TO_RADIANS;
 
     // compute LST and print
     double gst = sgTimeCalcGST( mjd );
@@ -217,7 +219,7 @@ void SGTime::update( double lon, double lat, long int warp ) {
     jd = mjd + MJD0;
     FG_LOG( FG_EVENT, FG_DEBUG, "  Current Julian Date = " << jd );
 
-    // printf("  Current Longitude = %.3f\n", FG_Longitude * RAD_TO_DEG);
+    // printf("  Current Longitude = %.3f\n", FG_Longitude * SGD_RADIANS_TO_DEGREES);
 
     // Calculate local side real time
     if ( gst_diff < -100.0 ) {
@@ -229,18 +231,18 @@ void SGTime::update( double lon, double lat, long int warp ) {
       
        gst_diff = gst_precise - gst_course;
 
-       lst = sidereal_course( cur_time, gmt, -(lon * RAD_TO_DEG) ) + gst_diff;
+       lst = sidereal_course( cur_time, gmt, -(lon * SGD_RADIANS_TO_DEGREES) ) + gst_diff;
     } else {
        // course + difference should drift off very slowly
        gst = sidereal_course( cur_time, gmt, 0.00 ) + gst_diff;
-       lst = sidereal_course( cur_time, gmt, -(lon * RAD_TO_DEG) ) + gst_diff;
+       lst = sidereal_course( cur_time, gmt, -(lon * SGD_RADIANS_TO_DEGREES) ) + gst_diff;
     }
 
     FG_LOG( FG_EVENT, FG_DEBUG,
            "  Current lon=0.00 Sidereal Time = " << gst );
     FG_LOG( FG_EVENT, FG_DEBUG,
            "  Current LOCAL Sidereal Time = " << lst << " (" 
-           << sidereal_precise( mjd, -(lon * RAD_TO_DEG) ) 
+           << sidereal_precise( mjd, -(lon * SGD_RADIANS_TO_DEGREES) ) 
            << ") (diff = " << gst_diff << ")" );
 }
 
@@ -250,7 +252,7 @@ void SGTime::updateLocal( double lon, double lat, const string& root )
 {
   time_t currGMT;
   time_t aircraftLocalTime;
-  GeoCoord location( RAD_TO_DEG * lat, RAD_TO_DEG * lon );
+  GeoCoord location( SGD_RADIANS_TO_DEGREES * lat, SGD_RADIANS_TO_DEGREES * lon );
   GeoCoord* nearestTz = tzContainer->getNearest(location);
   FGPath zone( root );
   zone.append ( nearestTz->getDescription() );
@@ -407,14 +409,23 @@ time_t sgTimeGetGMT(int year, int month, int day, int hour, int min, int sec)
 #  define MK_TIME_IS_GMT 1
 #endif
 
-#if defined( HAVE_TIMEGM ) 
+#if defined( HAVE_TIMEGM )
     return ( timegm(&mt) );
 #elif defined( MK_TIME_IS_GMT )
-    return ( mktime(&mt) );
+    time_t ret = mktime(&mt);
+    // This is necessary as some mktime() calls may
+    // try to access the system timezone files
+    // if this open fails errno is set to 2
+    // CYGWIN for one does this
+    if ( errno ) {
+       perror( "sgTimeGetGMT()" );
+       errno = 0;
+    }
+    return ret;
 #else // ! defined ( MK_TIME_IS_GMT )
 
     // timezone seems to work as a proper offset for Linux & Solaris
-#   if defined( __linux__ ) || defined( __sun__ ) 
+#   if defined( __linux__ ) || defined( __sun__ )
 #       define TIMEZONE_OFFSET_WORKS 1
 #   endif
 
@@ -429,7 +440,7 @@ time_t sgTimeGetGMT(int year, int month, int day, int hour, int min, int sec)
     timezone = fix_up_timezone( timezone );
 
 #  if defined( TIMEZONE_OFFSET_WORKS )
-    FG_LOG( FG_EVENT, FG_DEBUG, 
+    FG_LOG( FG_EVENT, FG_DEBUG,
            "start = " << start << ", timezone = " << timezone );
     return( start - timezone );
 #  else // ! defined( TIMEZONE_OFFSET_WORKS )