summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-29 14:17:34 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-29 14:17:34 +0000
commita0b1906a2fed6e04fe02084d01496b0cda819992 (patch)
treecc6e977397955d074f960e72b047f738a40906a8
parent58dde35a607dc1e70cd830b5fac253c97964e628 (diff)
downloadruby-a0b1906a2fed6e04fe02084d01496b0cda819992.tar.gz
ruby-a0b1906a2fed6e04fe02084d01496b0cda819992.tar.xz
ruby-a0b1906a2fed6e04fe02084d01496b0cda819992.zip
* io.c (rb_scan_open_args): rb_utf8mac_encoding is undefined.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25161 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 035b17b75..84da82d94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 29 23:17:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_scan_open_args): rb_utf8mac_encoding is undefined.
+
Tue Sep 29 22:25:41 2009 Tanaka Akira <akr@fsij.org>
* include/ruby/intern.h (rb_struct_iv_get): deprecated because it is
diff --git a/io.c b/io.c
index 586e7b5bd..8bc450d15 100644
--- a/io.c
+++ b/io.c
@@ -5319,7 +5319,7 @@ rb_scan_open_args(int argc, VALUE *argv,
if (rb_usascii_encoding() != fname_encoding
&& rb_ascii8bit_encoding() != fname_encoding
&& rb_utf8_encoding() != fname_encoding
- && rb_utf8mac_encoding() != fname_encoding
+ && utf8mac_encoding != fname_encoding
&& fs_encoding != fname_encoding) {
static VALUE fs_enc;
if (!fs_enc)