diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-05-01 15:33:06 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-05-01 15:33:26 -0700 |
commit | 634d0a907ff7ba5901dfe3624e58d718f3f37cec (patch) | |
tree | 6bf86cf04d8b28a79693df9cdef1063c9b06ca76 /lib/time_rz.c | |
parent | 16b49e214ad828de29ceb57ad1b443eece9bba03 (diff) | |
download | emacs-634d0a907ff7ba5901dfe3624e58d718f3f37cec.tar.gz |
Merge from gnulib
This incorporates:
2017-05-01 New module 'localtime-buffer'
2017-04-30 utimens: Add support for native Windows
* admin/merge-gnulib (AVOIDED_MODULES): Add tzset.
* configure.ac (tzset): No need for Emacs itself to check now.
* lib/gettimeofday.c, lib/time.in.h, lib/time_rz.c, lib/utimens.c:
* m4/gettimeofday.m4, m4/time_h.m4, m4/time_rz.m4: Copy from gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/localtime-buffer.c, lib/localtime-buffer.h:
* m4/localtime-buffer.m4: New files, copied from gnulib.
* src/editfns.c (init_editfns): Assume tzset is callable.
Diffstat (limited to 'lib/time_rz.c')
-rw-r--r-- | lib/time_rz.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/time_rz.c b/lib/time_rz.c index c41a8ef47ac..17bc11c20e9 100644 --- a/lib/time_rz.c +++ b/lib/time_rz.c @@ -40,10 +40,6 @@ # define SIZE_MAX ((size_t) -1) #endif -#if !HAVE_TZSET -static void tzset (void) { } -#endif - /* The approximate size to use for small allocation requests. This is the largest "small" request for the GNU C library malloc. */ enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 }; |