X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/812b526d127c6657e571db8b33a58137af6709cd..3fe2333a1fa62389ad049a1c1ca43fee77a3fef0:/lib/xgetdate.c diff --git a/lib/xgetdate.c b/lib/xgetdate.c index ae9e183..81472f1 100644 --- 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. */