aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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));