From e3f4cf8362b94c2ba5501e162e044754c384bcce Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 6 Jun 2024 18:22:21 +0200 Subject: [PATCH] parse-datetime: Support time zone names on MSVC. * lib/parse-datetime.y (parse_datetime_body): Use HAVE_TZNAME_ARRAY instead of HAVE_TZNAME. Don't declare tzname. * modules/parse-datetime (Depends-on): Add tzname. * m4/parse-datetime.m4 (gl_PARSE_DATETIME): Don't invoke AC_STRUCT_TIMEZONE. --- ChangeLog | 9 +++++++++ lib/parse-datetime.y | 7 ++----- m4/parse-datetime.m4 | 5 ++--- modules/parse-datetime | 1 + 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 308bec6bc7..c315f4d08c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2024-06-06 Bruno Haible + + parse-datetime: Support time zone names on MSVC. + * lib/parse-datetime.y (parse_datetime_body): Use HAVE_TZNAME_ARRAY + instead of HAVE_TZNAME. Don't declare tzname. + * modules/parse-datetime (Depends-on): Add tzname. + * m4/parse-datetime.m4 (gl_PARSE_DATETIME): Don't invoke + AC_STRUCT_TIMEZONE. + 2024-06-06 Bruno Haible time_rz: Support time zone names on MSVC. diff --git a/lib/parse-datetime.y b/lib/parse-datetime.y index f926f4d84c..a3516d0bcc 100644 --- a/lib/parse-datetime.y +++ b/lib/parse-datetime.y @@ -1,7 +1,7 @@ %{ /* Parse a string into an internal timestamp. - Copyright (C) 1999-2000, 2002-2023 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1864,11 +1864,8 @@ parse_datetime_body (struct timespec *result, char const *p, } } #else -#if HAVE_TZNAME +#if HAVE_TZNAME_ARRAY { -# if !HAVE_DECL_TZNAME - extern char *tzname[]; -# endif int i; for (i = 0; i < 2; i++) { diff --git a/m4/parse-datetime.m4 b/m4/parse-datetime.m4 index 7876b4118f..2ef502b7db 100644 --- a/m4/parse-datetime.m4 +++ b/m4/parse-datetime.m4 @@ -1,5 +1,5 @@ -# parse-datetime.m4 serial 27 -dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc. +# parse-datetime.m4 serial 28 +dnl Copyright (C) 2002-2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -48,7 +48,6 @@ AC_DEFUN([gl_PARSE_DATETIME], dnl Prerequisites of lib/parse-datetime.y. AC_REQUIRE([gl_BISON]) AC_REQUIRE([gl_C_COMPOUND_LITERALS]) - AC_STRUCT_TIMEZONE AC_REQUIRE([gl_CLOCK_TIME]) AC_REQUIRE([gl_TM_GMTOFF]) ]) diff --git a/modules/parse-datetime b/modules/parse-datetime index 60ac0b0824..8590f0b2a9 100644 --- a/modules/parse-datetime +++ b/modules/parse-datetime @@ -28,6 +28,7 @@ time-h time_r time_rz timegm +tzname configure.ac: gl_PARSE_DATETIME -- 2.39.5