diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-03 00:06:52 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-03 00:06:52 -0700 |
commit | 0a858ebfc57a072ae8ab65f509d8a4901a2ec073 (patch) | |
tree | dd81bcdf11f3d3efa32ffe00f7cdc90d3c1144d9 /lib/dup2.c | |
parent | b52f569dcfc5c2e1b764c89d27ea8699a44228e6 (diff) | |
download | emacs-0a858ebfc57a072ae8ab65f509d8a4901a2ec073.tar.gz |
Merge from gnulib.
* src/conf_post.h (__has_builtin, assume): Remove; gnulib now does these.
* src/lisp.h: Include <verify.h>, for 'assume'.
This also incorpoprates:
2013-10-02 verify: new macro 'assume'
2013-09-26 dup2, dup3: work around another cygwin crasher
2013-09-26 getdtablesize: work around cygwin issue
Diffstat (limited to 'lib/dup2.c')
-rw-r--r-- | lib/dup2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/dup2.c b/lib/dup2.c index 9219eb38238..f128e7a63cd 100644 --- a/lib/dup2.c +++ b/lib/dup2.c @@ -96,7 +96,11 @@ rpl_dup2 (int fd, int desired_fd) /* On Linux kernels 2.6.26-2.6.29, dup2 (fd, fd) returns -EBADF. On Cygwin 1.5.x, dup2 (1, 1) returns 0. On Cygwin 1.7.17, dup2 (1, -1) dumps core. + On Cygwin 1.7.25, dup2 (1, 256) can dump core. On Haiku, dup2 (fd, fd) mistakenly clears FD_CLOEXEC. */ +# if HAVE_SETDTABLESIZE + setdtablesize (desired_fd + 1); +# endif if (desired_fd < 0) fd = desired_fd; if (fd == desired_fd) |