lib/addr.c, etc.: Return plain addresses from `netaddress_resolve'.

[disorder] / lib / xgetdate.c

diff --git a/lib/xgetdate.c b/lib/xgetdate.c
index ae9e183ab448518a68887a67b1afc9c48cae9cfa..81472f1246c87e473dc16e8f34689b69b3d291a3 100644 (file)
--- a/lib/xgetdate.c
+++ b/lib/xgetdate.c
@@ -119,22 +119,22 @@ xgetdate_r (const char *string, struct tm *tp,
            const char *const *template)
 {
   const char *line;
-  size_t len;
   char *result = NULL;
   time_t timer;
   struct tm tm;
   int mday_ok = 0;
 
   line = NULL;
-  len = 0;
   while((line = *template++))
     {
       /* Do the conversion.  */
       tp->tm_year = tp->tm_mon = tp->tm_mday = tp->tm_wday = INT_MIN;
       tp->tm_hour = tp->tm_sec = tp->tm_min = INT_MIN;
       tp->tm_isdst = -1;
+#if !_WIN32
       tp->tm_gmtoff = 0;
       tp->tm_zone = NULL;
+#endif
       result = my_strptime (string, line, tp);
       if (result && *result == '\0')
        break;
@@ -145,7 +145,11 @@ xgetdate_r (const char *string, struct tm *tp,
 
   /* Get current time.  */
   time (&timer);
-  localtime_r (&timer, &tm);
+#if _WIN32
+  localtime_s(&tm, &timer);
+#else
+  localtime_r(&timer, &tm);
+#endif
 
   /* If only the weekday is given, today is assumed if the given day
      is equal to the current day and next week if it is less.  */