Revert to using timegm() following Hal Murray's report of Fedora flakiness.

All regression tests pass.

1 files changed, 6 insertions, 3 deletions

diff --git a/gpsutils.c b/gpsutils.c
index b1554593..eb70e179 100644
--- a/gpsutils.c
+++ b/gpsutils.c
@@ -354,10 +354,13 @@ timestamp_t iso8601_to_unix( /*@in@*/ char *isotime)
 	usec = 0;
 
     /*
-     * This could be "return (timestamp_t)timegm(&tm) + usec;" but
-     * that is glibc only.
+     * This is a glibc dependency; timegm() is not standard.  It would
+     * be nice if we could say mktime(&tm) - timezone + usec instead,
+     * but that seems to fail on newer Fedora versions in a way that
+     * suggests timezone is being set improperly (off by an hour).
+     * Also timezon is not available at all on some BSDs.
      */
-    return (timestamp_t)mktime(&tm) - timezone + usec;
+    return (timestamp_t)timegm(&tm) + usec;
 #else
     double usec = 0;