* io.c (rb_cloexec_pipe): remove workaround of r33587.
The bug of NetBSD is fixed on Mon Oct 31 21:31:29 UTC 2011. http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=45545 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
809006f407
commit
f0bd639693
@ -1,3 +1,9 @@
|
||||
Tue Nov 1 21:39:00 2011 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* io.c (rb_cloexec_pipe): remove workaround of r33587.
|
||||
The bug of NetBSD is fixed on Mon Oct 31 21:31:29 UTC 2011.
|
||||
http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=45545
|
||||
|
||||
Tue Nov 1 19:49:08 2011 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* io.c (rb_io_reopen): call rb_fd_fix_cloexec instead of
|
||||
|
6
io.c
6
io.c
@ -253,14 +253,8 @@ rb_cloexec_pipe(int fildes[2])
|
||||
static int try_pipe2 = 1;
|
||||
if (try_pipe2) {
|
||||
ret = pipe2(fildes, O_CLOEXEC);
|
||||
#ifdef __NetBSD__
|
||||
/* pipe2 is available since NetBSD 6.0. */
|
||||
if (ret > 0)
|
||||
return 0;
|
||||
#else
|
||||
if (ret != -1)
|
||||
return ret;
|
||||
#endif
|
||||
/* pipe2 is available since Linux 2.6.27, glibc 2.9. */
|
||||
if (errno == ENOSYS) {
|
||||
try_pipe2 = 0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user