summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-01 10:49:40 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-01 10:49:40 +0000
commit809006f407147d6788d785e86590a79603110a38 (patch)
treefb038c232e09739c28e901f0307aa4a18e0a11ef
parent89a1258110b72b700016ea09cbd7b73c3a875dea (diff)
* io.c (rb_io_reopen): call rb_fd_fix_cloexec instead of
rb_maygvl_fd_fix_cloexec. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f29e73226b..47b8214d89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 1 19:49:08 2011 Tanaka Akira <akr@fsij.org>
+
+ * io.c (rb_io_reopen): call rb_fd_fix_cloexec instead of
+ rb_maygvl_fd_fix_cloexec.
+
Tue Nov 1 19:00:30 2011 Tanaka Akira <akr@fsij.org>
* io.c (rb_io_reopen): call rb_maygvl_fd_fix_cloexec after freopen().
diff --git a/io.c b/io.c
index 41f9379d26..56fc3f3f7c 100644
--- a/io.c
+++ b/io.c
@@ -6059,7 +6059,7 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
rb_sys_fail_path(fptr->pathv);
}
fptr->fd = fileno(fptr->stdio_file);
- rb_maygvl_fd_fix_cloexec(fptr->fd);
+ rb_fd_fix_cloexec(fptr->fd);
#ifdef USE_SETVBUF
if (setvbuf(fptr->stdio_file, NULL, _IOFBF, 0) != 0)
rb_warn("setvbuf() can't be honoured for %s", RSTRING_PTR(fptr->pathv));