diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-16 08:11:35 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-16 08:12:22 -0800 |
| commit | f74595aace4b1240402562b0073b06c170969327 (patch) | |
| tree | cd50bca64305e2fca5d4fa518e102e530a8b54ef /lib/localtime-buffer.c | |
| parent | 07d8827946f9364180f18d6842acc80f0997ed75 (diff) | |
| download | emacs-f74595aace4b1240402562b0073b06c170969327.tar.gz | |
Update from Gnulib
This incorporates:
2018-12-16 regex: propagate fix for glibc bug 18040
2018-12-16 obstack, libc-config: Support HP-UX cc in C99 mode
2018-12-15 regex: work around a bug in glibc-2.27 and prior
2018-12-13 localtime-buffer: Avoid endless recursion
* build-aux/config.guess, build-aux/config.sub, lib/cdefs.h:
* lib/gettext.h, lib/localtime-buffer.c, lib/regexec.c, m4/regex.m4:
Copy from Gnulib.
Diffstat (limited to 'lib/localtime-buffer.c')
| -rw-r--r-- | lib/localtime-buffer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/localtime-buffer.c b/lib/localtime-buffer.c index df11f4321db..910c8bcfed3 100644 --- a/lib/localtime-buffer.c +++ b/lib/localtime-buffer.c @@ -34,6 +34,7 @@ struct tm *localtime_buffer_addr = &tm_zero_buffer; struct tm * rpl_localtime (time_t const *timep) +#undef localtime { struct tm *tm = localtime (timep); @@ -46,6 +47,7 @@ rpl_localtime (time_t const *timep) /* Same as above, since gmtime and localtime use the same buffer. */ struct tm * rpl_gmtime (time_t const *timep) +#undef gmtime { struct tm *tm = gmtime (timep); |