diff options
| author | Paul Eggert | 2017-04-30 00:38:28 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-04-30 00:40:33 -0700 |
| commit | 7e4dae99d619315179a90461b42ae8d734c5bb45 (patch) | |
| tree | 98a34f046bd50c1a38bf19cb96e5e0fb77ecf441 /admin | |
| parent | a3f3fea14abbc59a2b47cae5bec6252ec3a1f8cf (diff) | |
| download | emacs-7e4dae99d619315179a90461b42ae8d734c5bb45.tar.gz emacs-7e4dae99d619315179a90461b42ae8d734c5bb45.zip | |
Merge from gnulib
This avoids incorporating the following, which I suspect are
more trouble for Emacs than they’re worth:
2017-04-29 stat, fstat: fix time_t etc. on native Windows platforms
* admin/merge-gnulib (AVOIDED_MODULES): Avoid stat, too.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/pathmax.h, lib/stat.c, m4/pathmax.m4, m4/stat.m4: Remove.
Diffstat (limited to 'admin')
| -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 52fcd41b1cd..1f0e55f5860 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -48,7 +48,7 @@ AVOIDED_MODULES=' | |||
| 48 | close dup fchdir fstat | 48 | close dup fchdir fstat |
| 49 | malloc-posix msvc-inval msvc-nothrow | 49 | malloc-posix msvc-inval msvc-nothrow |
| 50 | open openat-die opendir raise | 50 | open openat-die opendir raise |
| 51 | save-cwd select setenv sigprocmask stdarg stdbool | 51 | save-cwd select setenv sigprocmask stat stdarg stdbool |
| 52 | threadlib unsetenv | 52 | threadlib unsetenv |
| 53 | ' | 53 | ' |
| 54 | 54 | ||