summaryrefslogtreecommitdiff
path: root/lib/mktime.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-08-03 15:10:58 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-08-03 15:12:06 -0700
commit7f9721d3990155bae83e4e4840f0ff4913868d50 (patch)
tree6c7283459b89571444694523e3431834b1952f92 /lib/mktime.c
parent967e2ef61dab8d2046f3285eefa71f3dcb9d9b60 (diff)
downloademacs-7f9721d3990155bae83e4e4840f0ff4913868d50.tar.gz
Update from gnulib
This incorporates: 2016-07-03 mktime: call tzset as per POSIX * doc/misc/texinfo.tex, lib/mktime.c, m4/mktime.m4: Copy from gnulib.
Diffstat (limited to 'lib/mktime.c')
-rw-r--r--lib/mktime.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/mktime.c b/lib/mktime.c
index 40bc2a38a21..8ee4e5ecab4 100644
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -470,6 +470,8 @@ mktime (struct tm *tp)
time zone names contained in the external variable 'tzname' shall
be set as if the tzset() function had been called. */
__tzset ();
+#elif HAVE_TZSET
+ tzset ();
#endif
return __mktime_internal (tp, __localtime_r, &localtime_offset);