+2024-06-06 Bruno Haible <bruno@clisp.org>
+
+ tzname: New module.
+ * lib/time.in.h (tzname): New declaration.
+ * m4/tzname.m4: New file.
+ * m4/time_h.m4 (gl_TIME_H_REQUIRE_DEFAULTS): Initialize GNULIB_TZNAME.
+ * modules/time-h (Makefile.am): Substitute GNULIB_TZNAME.
+ * modules/tzname: New file.
+
2024-06-05 Bruno Haible <bruno@clisp.org>
setenv: On native Windows, don't modify _environ directly.
# endif
# endif
+# if @GNULIB_TZNAME@
+/* tzname[0..1]: Abbreviated time zone names, set by the tzset() function. */
+# if NEED_DECL_TZNAME
+extern
+# ifdef __cplusplus
+ "C"
+# endif
+ char *tzname[];
+# endif
+# if defined _WIN32 && !defined __CYGWIN__
+/* On native Windows, map 'tzname' to '_tzname' etc., so that -loldnames is not
+ required. */
+# undef tzname
+# define tzname _tzname
+# endif
+# endif
+
/* Set *TS to the current time, and return BASE.
Upon failure, return 0. */
# if @GNULIB_TIMESPEC_GET@
# Copyright (C) 2000-2001, 2003-2007, 2009-2024 Free Software Foundation, Inc.
-# serial 23.1
+# serial 23.2
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GETRES])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ])
+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZNAME])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET])
dnl Support Microsoft deprecated alias function names by default.
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1])
--- /dev/null
+# tzname.m4
+# serial 1
+dnl Copyright (C) 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.
+
+dnl gl_TZNAME tests how the time zone can be obtained.
+dnl It is similar AC_STRUCT_TIMEZONE, but also supports MSVC.
+dnl It defines
+dnl * the C macro HAVE_STRUCT_TM_TM_ZONE to 1 if 'struct tm' has a field
+dnl 'tm_zone',
+dnl * otherwise:
+dnl - the C macro HAVE_TZNAME_ARRAY to 1 if there the rvalue 'tzname'
+dnl or (on native Windows) '_tzname' is usable,
+dnl - the C macro NEED_DECL_TZNAME to 1 if 'tzname' needs to be declared
+dnl extern char *tzname[];
+dnl before use.
+AC_DEFUN([gl_TZNAME],
+[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+
+ dnl Set ac_cv_member_struct_tm_tm_zone,
+ dnl ac_cv_var_tzname, ac_cv_have_decl_tzname.
+ dnl Possibly define HAVE_STRUCT_TM_TM_ZONE,
+ dnl HAVE_TZNAME, HAVE_DECL_TZNAME.
+ AC_REQUIRE([AC_STRUCT_TIMEZONE])
+
+ dnl If 'struct tm' has a field 'tm_zone', don't test for tzname or _tzname.
+ dnl Rationale: Some code assumes that HAVE_STRUCT_TM_TM_ZONE and HAVE_TZNAME
+ dnl are exclusive.
+ if test "$ac_cv_member_struct_tm_tm_zone" != yes; then
+ if test $ac_cv_var_tzname = yes && test $ac_cv_have_decl_tzname != yes; then
+ AC_DEFINE([NEED_DECL_TZNAME], [1],
+ [Define to 1 if tzname exists but needs to be declared.])
+ fi
+ AC_CACHE_CHECK([for tzname array],
+ [gl_cv_var_tzname],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <time.h>
+ #if NEED_DECL_TZNAME
+ extern char *tzname[];
+ #endif
+ #if defined _WIN32 && !defined __CYGWIN__
+ #undef tzname
+ #define tzname _tzname
+ #endif
+ ]],
+ [[return tzname[0][0];
+ ]])
+ ],
+ [gl_cv_var_tzname=yes],
+ [gl_cv_var_tzname=no])
+ ])
+ if test $gl_cv_var_tzname = yes; then
+ AC_DEFINE([HAVE_TZNAME_ARRAY], [1],
+ [Define to 1 if 'struct tm' does not have a field 'tm_zone'
+ but instead 'tzname' is usable.])
+ fi
+ fi
+])
-e 's/@''GNULIB_TIMESPEC_GETRES''@/$(GNULIB_TIMESPEC_GETRES)/g' \
-e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
-e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \
+ -e 's/@''GNULIB_TZNAME''@/$(GNULIB_TZNAME)/g' \
-e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \
-e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \
-e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \