diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-25 06:59:53 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-25 06:59:53 +0000 |
| commit | 1748b91a405fc11d3237cae023761f73af775a6d (patch) | |
| tree | e26d0eb21d12481db0dcb1bc3efdd4f39daccc3a | |
| parent | e52df767933955850eb95d7e039d46e24e18dbc4 (diff) | |
| download | ruby-1748b91a405fc11d3237cae023761f73af775a6d.tar.gz ruby-1748b91a405fc11d3237cae023761f73af775a6d.tar.xz ruby-1748b91a405fc11d3237cae023761f73af775a6d.zip | |
* encoding.c (rb_enc_register): do not use based_encoding to check if
dummy encoding.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | encoding.c | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Dec 25 15:59:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (rb_enc_register): do not use based_encoding to check if + dummy encoding. + Tue Dec 25 15:55:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_succ): fix for string with non-alphanumeric chars. diff --git a/encoding.c b/encoding.c index c926dac14..cfa49a512 100644 --- a/encoding.c +++ b/encoding.c @@ -166,7 +166,6 @@ enc_register(const char *name, rb_encoding *encoding) return enc_register_at(index - 1, name, encoding); } -static VALUE enc_based_encoding(VALUE); static void set_encoding_const(const char *, rb_encoding *); int rb_enc_registered(const char *name); @@ -183,7 +182,7 @@ rb_enc_register(const char *name, rb_encoding *encoding) index = enc_register(name, encoding); } else if (enc_initialized_p(oldenc) && - !NIL_P(enc_based_encoding(ENC_FROM_ENCODING(oldenc)))) { + !ENC_DUMMY_P(ENC_FROM_ENCODING(oldenc))) { enc_register_at(index, name, encoding); } else { |