diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-30 14:52:10 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-30 14:53:17 -0700 |
| commit | b6aa3446df5e715fd74f010afad75c3c8589a9a1 (patch) | |
| tree | 3b5377b3651ef95a0a77becaa7ee7ccba7b37168 /admin/merge-gnulib | |
| parent | 3ad9d5c347739bb6c5450ed443ffa1608a94394c (diff) | |
| download | emacs-b6aa3446df5e715fd74f010afad75c3c8589a9a1.tar.gz | |
Merge from gnulib
This incorporates:
2017-04-30 strftime-fixes: New module
2017-04-30 mktime: Work around TZ problem on native Windows
2017-04-30 ctime, localtime: New modules
2017-04-30 gettimeofday: Provide higher resolution on native Windows
2017-04-29 utime-h: Modernize handling of 'struct utimbuf'
2017-04-29 Make use of module 'utime-h'
2017-04-30 Fix a few typos
* admin/merge-gnulib (AVOIDED_MODULES): Avoid utime-h, too.
* lib/gettimeofday.c, lib/mktime.c, lib/time.in.h, lib/utimens.c:
* m4/gettimeofday.m4, m4/include_next.m4, m4/mktime.m4:
* m4/strftime.m4, m4/time_h.m4, m4/timegm.m4, m4/utimens.m4:
Copy from gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'admin/merge-gnulib')
| -rwxr-xr-x | admin/merge-gnulib | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 1f0e55f5860..c2ab3571fee 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -49,7 +49,7 @@ AVOIDED_MODULES=' malloc-posix msvc-inval msvc-nothrow open openat-die opendir raise save-cwd select setenv sigprocmask stat stdarg stdbool - threadlib unsetenv + threadlib unsetenv utime-h ' GNULIB_TOOL_FLAGS=' |