summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-11 13:23:42 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-11 13:23:42 +0000
commit8edc6f44871441c3df5ec0273f06852e7eccee79 (patch)
treefaf03bbf61031f4836bf903a3b1ea36baf5f53e4
parentea52cac1487cea91a148daffbfe0dacef672051b (diff)
merge revision(s) 57204:
r57203 needs r57204. io.c: use io_close to close ARGF git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--io.c2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/io.c b/io.c
index 873b477ab5..1074689560 100644
--- a/io.c
+++ b/io.c
@@ -7986,7 +7986,7 @@ argf_close(VALUE argf)
if (RB_TYPE_P(file, T_FILE)) {
rb_io_set_write_io(file, Qnil);
}
- rb_funcall3(file, rb_intern("close"), 0, 0);
+ io_close(file);
ARGF.init_p = -1;
}
diff --git a/version.h b/version.h
index 5fefe537b2..6a9a3614a5 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.0"
#define RUBY_RELEASE_DATE "2017-03-11"
-#define RUBY_PATCHLEVEL 9
+#define RUBY_PATCHLEVEL 10
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3