summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-07-09 10:16:21 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-07-09 10:16:21 -0700
commit7b154deff5f593d056b54d81baf627dcea6bb149 (patch)
tree087a09ad257f99b921051708179b74f2bc3dbebe /admin
parentd74647c382d793c2df2eb5b4756b9742ea57c1cc (diff)
downloademacs-7b154deff5f593d056b54d81baf627dcea6bb149.tar.gz
Port recent close-on-exec changes to Cygwin.
* lib/binary-io.c, lib/binary-io.h: New files. Merge from gnulib, incorporating: 2013-07-09 accept4, dup3, pipe2: port to Cygwin * lib/pipe2.c: Update from gnulib, as part of this merge. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. Fixes: debbugs:14821
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog3
-rwxr-xr-xadmin/merge-gnulib2
2 files changed, 4 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index deb3059f8d2..b9dc8cbafdc 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,8 @@
2013-07-09 Paul Eggert <eggert@cs.ucla.edu>
+ Port recent close-on-exec changes to Cygwin (Bug#14821).
+ * merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid binary-io.
+
Handle error numbers a bit more reliably.
* merge-gnulib (GNULIB_MODULES): Remove ignore-value.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index be4dfdd409c..82e0cd77fca 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -41,7 +41,7 @@ GNULIB_MODULES='
'
GNULIB_TOOL_FLAGS='
- --avoid=binary-io --avoid=close --avoid=dup
+ --avoid=close --avoid=dup
--avoid=fchdir --avoid=fstat
--avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
--avoid=open --avoid=openat-die --avoid=opendir