kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* encoding.c (rb_enc_compatible): should not judge compatibility

Browse source 
based on rb_enc_asciicompat().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-12-13 07:44:52 +00:00
parent 266d186bcf
commit 02501dbe91
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Dec 13 16:41:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* encoding.c (rb_enc_compatible): should not judge compatibility
based on rb_enc_asciicompat().
Thu Dec 13 13:09:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* include/ruby/io.h (MakeOpenFile): fptr->enc should be

6
encoding.c
View file

@ -388,12 +388,6 @@ rb_enc_compatible(VALUE str1, VALUE str2)
if (idx1 == idx2) {
return rb_enc_from_index(idx1);
}
if (idx1 == 0 && rb_enc_asciicompat(enc = rb_enc_from_index(idx2)))
return enc;
if (idx2 == 0 && rb_enc_asciicompat(enc = rb_enc_from_index(idx1)))
return enc;
if (BUILTIN_TYPE(str1) != T_STRING) {
VALUE tmp = str1;
str1 = str2;