diff options
| author | Bruno Haible <bruno@clisp.org> | 2020-08-14 20:03:33 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2020-08-14 20:03:33 +0200 |
| commit | 5afb29f59a6f1764eb3059cc0485fb50202afea1 (patch) | |
| tree | 10c186176f0ad5d35642da31d791097ee7fecb98 /lib | |
| parent | 424bb97793e96c63c090e9dbf2d442a38e367c94 (diff) | |
| download | gnulib-5afb29f59a6f1764eb3059cc0485fb50202afea1.tar.gz | |
nstrftime: Assume tzset exists.
* lib/nstrftime.c (HAVE_TZSET): Remove macro.
(__strftime_internal): Test my_strftime, not HAVE_TZSET.
* m4/nstrftime.m4 (gl_FUNC_GNU_STRFTIME): Don't test for tzset.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/nstrftime.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/nstrftime.c b/lib/nstrftime.c index 791fbff7fd..35b65bbbd6 100644 --- a/lib/nstrftime.c +++ b/lib/nstrftime.c @@ -21,7 +21,6 @@ # define HAVE_TM_GMTOFF 1 # define HAVE_TM_ZONE 1 # define HAVE_TZNAME 1 -# define HAVE_TZSET 1 # include "../locale/localeinfo.h" #else # include <config.h> @@ -389,7 +388,6 @@ iso_week_days (int yday, int wday) #endif #ifdef my_strftime -# undef HAVE_TZSET # define extra_args , tz, ns # define extra_args_spec , timezone_t tz, int ns #else @@ -523,7 +521,7 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize) { /* POSIX.1 requires that local time zone information be used as though strftime called tzset. */ -# if HAVE_TZSET +# ifndef my_strftime if (!*tzset_called) { tzset (); @@ -1417,7 +1415,7 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize) /* POSIX.1 requires that local time zone information be used as though strftime called tzset. */ -# if HAVE_TZSET +# ifndef my_strftime if (!*tzset_called) { tzset (); |