master a773a78312 3/4: Port to current Gnulib some more

[Paul Eggert]

branch: master
commit a773a7831226c146edd40dbaf97f3cfad995f8ee
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>

    Port to current Gnulib some more
    
    * admin/merge-gnulib: Remove lib/stdio-read.c and lib/stdio-write.c,
    as Emacs doesn’t need these new Gnulib files.
---
 admin/merge-gnulib | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 73b3d39049..4045eabf4e 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -109,7 +109,9 @@ done
 
 "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \
        $avoided_flags $GNULIB_MODULES &&
-rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \
+rm -- "$src"lib/gl_openssl.h \
+      "$src"lib/stdio-read.c "$src"lib/stdio-write.c \
+      "$src"m4/fcntl-o.m4 \
       "$src"m4/gl-openssl.m4 \
       "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \
       "$src"m4/manywarnings-c++.m4 \