diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-23 00:07:24 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-23 00:07:24 +0000 |
| commit | 38c303bb5257a0ff811a2d9256f9ed32b8a30b06 (patch) | |
| tree | 197e430df647e856130e5bc862f2c6507a8e60d1 | |
| parent | 5b809a28f825015661e7f51f0ecb5ecdfa7b77bd (diff) | |
| download | ruby-38c303bb5257a0ff811a2d9256f9ed32b8a30b06.tar.gz | |
ext/nkf/nkf.c follow previous rb_ascii_encoding renaming.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/nkf/nkf.c | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -1,7 +1,7 @@ -Sun Dec 23 08:42:51 2007 Tanaka Akira <akr@fsij.org> +Sun Dec 23 09:07:02 2007 Tanaka Akira <akr@fsij.org> * include/ruby/encoding.h, encoding.c, re.c, io.c, parse.y, numeric.c, - ruby.c, transcode.c: rename rb_ascii_encoding. to + ruby.c, transcode.c, ext/nkf/nkf.c: rename rb_ascii_encoding. to rb_ascii8bit_encoding. rb_ascii_encoding is ambiguous with ASCII-8BIT and US-ASCII. diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index 68f8e3f6b6..d4afb84a38 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -69,7 +69,7 @@ rb_encoding* rb_nkf_enc_get(const char *name) nkf_native_encoding * nkf_base_enc = nkf_enc_to_base_encoding(nkf_enc); idx = rb_enc_find_index(nkf_enc_name(nkf_base_enc)); if (idx < 0) { - idx = rb_enc_replicate(name, rb_ascii_encoding()); + idx = rb_enc_replicate(name, rb_ascii8bit_encoding()); } else { rb_encoding *rb_enc = rb_enc_from_index(idx); idx = rb_enc_replicate(name, rb_enc); @@ -485,7 +485,7 @@ Init_nkf() rb_define_const(mNKF, "NOCONV", Qnil); rb_define_const(mNKF, "UNKNOWN", Qnil); rb_define_const(mNKF, "BINARY", rb_enc_from_encoding(rb_nkf_enc_get("BINARY"))); - rb_define_const(mNKF, "ASCII", rb_enc_from_encoding(rb_ascii_encoding())); + rb_define_const(mNKF, "ASCII", rb_enc_from_encoding(rb_ascii8bit_encoding())); rb_define_const(mNKF, "JIS", rb_enc_from_encoding(rb_nkf_enc_get("ISO-2022-JP"))); rb_define_const(mNKF, "EUC", rb_enc_from_encoding(rb_nkf_enc_get("EUC-JP"))); rb_define_const(mNKF, "SJIS", rb_enc_from_encoding(rb_nkf_enc_get("Shift_JIS"))); |