summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-18 05:31:35 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-18 05:31:35 +0000
commit235df5064824ab4e84f89d2208bc7437cd490ed5 (patch)
tree6b78821fe94164c670f966f7729041554027d91a
parent844952338be1dcc2fc2e726af14cdc76c3b7ac94 (diff)
* io.c (rb_open_file): not rb_enc_get_index but rb_enc_get.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c2920557db..8a58a79192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 18 14:30:06 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * io.c (rb_open_file): not rb_enc_get_index but rb_enc_get.
+
Wed Jun 18 13:49:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/win32.h (pipe): now pipe is textmode. although this
diff --git a/io.c b/io.c
index 8aa065718e..4084f0aeb6 100644
--- a/io.c
+++ b/io.c
@@ -4105,7 +4105,7 @@ rb_open_file(int argc, VALUE *argv, VALUE io)
#if defined _WIN32 || defined __APPLE__
{
static int fs_encoding;
- int fname_encoding = rb_enc_get_index(fname);
+ int fname_encoding = rb_enc_get(fname);
if (!fs_encoding)
fs_encoding = rb_filesystem_encoding();
if (rb_usascii_encoding() != fname_encoding