diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-03-07 10:57:11 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-03-07 10:57:11 -0800 |
| commit | 0d181095652bf8e1ca27935e54ecbb5443496334 (patch) | |
| tree | 5bf9307c53f29af1a493e42308887ce26785c5b3 /admin | |
| parent | d67d60a2eab5f7f1f9b1d31cd1c7dd1e31bb4d2b (diff) | |
| download | emacs-0d181095652bf8e1ca27935e54ecbb5443496334.tar.gz | |
Merge from gnulib.
This incorporates:
2014-03-04 stdint: fix missing SIZE_MAX on Android
2013-03-02 sys_types: avoid autoconf warning about gl_SYS_TYPES_H
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/stdint.in.h, lib/sys_types.in.h, m4/sys_types_h.m4:
Update from gnulib.
Fix oversight preventing lib/sys/types.h from being generated.
* admin/merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid sys_types.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rwxr-xr-x | admin/merge-gnulib | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index ef025c7630e..24f714eee8f 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2014-03-07 Paul Eggert <eggert@cs.ucla.edu> + + Fix oversight preventing lib/sys/types.h from being generated. + * merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid sys_types. + 2014-02-06 David Engster <deng@randomsample.de> * grammars/c.by (function-pointer): Correctly deal with anonymous diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 75808d30b60..6c0dffb6dce 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -48,7 +48,7 @@ GNULIB_TOOL_FLAGS=' --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise - --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types + --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=threadlib --conditional-dependencies --import --no-changelog --no-vc-files --makefile-name=gnulib.mk |