diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-07-27 16:50:44 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-07-27 16:51:22 -0700 |
| commit | 2856b1dd6f0ff5164eb5a54ddfadb9963f9e9237 (patch) | |
| tree | cff0c4728088e2cfc6939bd4a752c619a54c1cbd /m4 | |
| parent | 094d5e9ef0fac319816c00cc52e0a0f2ef41be37 (diff) | |
| download | emacs-2856b1dd6f0ff5164eb5a54ddfadb9963f9e9237.tar.gz | |
Merge from gnulib
This incorporates:
2015-07-27 time_rz: port better to MinGW
2015-07-27 time: port __need_time_t to MinGW
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/strftime.c, lib/time.in.h, lib/time_rz.c: Copy from gnulib.
* lib/time-internal.h: New file, from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-comp.m4 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index cf71d7eb187..c48d2e5be5c 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -959,6 +959,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/sys_types.in.h lib/tempname.c lib/tempname.h + lib/time-internal.h lib/time.in.h lib/time_r.c lib/time_rz.c |