merge revision(s) 28103:

* encoding.c (rb_enc_unicode_p): check the encoding is Unicode
	  or not by the name; not function's pointer. [ruby-dev:41479]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-06-05 17:56:55 +00:00
parent 09e9807a89
commit fce00b2422
3 changed files with 9 additions and 3 deletions

View file

@ -420,7 +420,8 @@ enc_ascii_compatible_p(VALUE enc)
int
rb_enc_unicode_p(rb_encoding *enc)
{
return rb_utf8_encoding()->is_code_ctype == enc->is_code_ctype;
const char *name = rb_enc_name(enc);
return name[0] == 'U' && name[1] == 'T' && name[2] == 'F' && name[4] != '7';
}
static const char *