aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2016-09-07 17:04:49 -0700
committerPaul Eggert2016-09-07 18:10:11 -0700
commit12a7e0f88eaa68aabe7e32589e2d5c8f776f6346 (patch)
treeac3b18f919ab71149b7fe50fdcaf7a953cced651 /admin
parenta08ce41ed8e9fd8768dcd1ecd22ff6bc4c4c7f8f (diff)
downloademacs-12a7e0f88eaa68aabe7e32589e2d5c8f776f6346.tar.gz
emacs-12a7e0f88eaa68aabe7e32589e2d5c8f776f6346.zip
Update from gnulib
This incorporates: 2016-09-07 flexmember: new macro FLEXALIGNOF 2016-09-07 flexmember: port better to GCC + valgrind 2016-08-18 Port modules to use getprogname explicitly 2016-09-02 manywarnings: add -fno-common * admin/merge-gnulib (GNULIB_TOOL_FLAGS): Don’t avoid flexmember, since time_rz now uses part of it. Instead, remove m4/flexmember.m4. * configure.ac (AC_C_FLEXIBLE_ARRAY_MEMBER): Define away, since Emacs assumes C99 and therefore removes m4/flexmember.m4. * lib/euidaccess.c, lib/group-member.c, lib/time_rz.c: * m4/manywarnings.m4: Copy from gnulib. * lib/flexmember.h: New file, from gnulib. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/merge-gnulib5
1 files changed, 3 insertions, 2 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 5d6512760d9..1e3b7599626 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -44,7 +44,7 @@ GNULIB_MODULES='
44 44
45GNULIB_TOOL_FLAGS=' 45GNULIB_TOOL_FLAGS='
46 --avoid=close --avoid=dup 46 --avoid=close --avoid=dup
47 --avoid=fchdir --avoid=flexmember --avoid=fstat 47 --avoid=fchdir --avoid=fstat
48 --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow 48 --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
49 --avoid=open --avoid=openat-die --avoid=opendir 49 --avoid=open --avoid=openat-die --avoid=opendir
50 --avoid=raise 50 --avoid=raise
@@ -93,7 +93,8 @@ test -x "$gnulib_srcdir"/gnulib-tool || {
93} 93}
94 94
95"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && 95"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
96rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \ 96rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/flexmember.m4 \
97 "$src"m4/gl-openssl.m4 \
97 "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 && 98 "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 &&
98cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && 99cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
99cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && 100cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&