naruse	2008-08-30 08:10:25 +0900 (Sat, 30 Aug 2008)

  New Revision: 18934

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18934

  Log:
    * encoding.c (enc_compatible_p): use TYPE not BUILTIN_TYPE.
      [ruby-dev:36048]

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

Index: encoding.c
===================================================================
--- encoding.c	(revision 18933)
+++ encoding.c	(revision 18934)
@@ -880,13 +880,11 @@
 {
     rb_encoding *enc;
 
-    if (SPECIAL_CONST_P(str1) || 
-	    BUILTIN_TYPE(str1) != T_STRING && BUILTIN_TYPE(str1) != T_REGEXP) {
+    if (SPECIAL_CONST_P(str1) || TYPE(str1) != T_STRING && TYPE(str1) != T_REGEXP) {
 	rb_raise(rb_eTypeError, "wrong argument type %s (expected String or Regexp)",
 		rb_obj_classname(str1));
     }
-    if (SPECIAL_CONST_P(str2) || 
-	    BUILTIN_TYPE(str2) != T_STRING && BUILTIN_TYPE(str2) != T_REGEXP) {
+    if (SPECIAL_CONST_P(str2) || TYPE(str2) != T_STRING && TYPE(str2) != T_REGEXP) {
 	rb_raise(rb_eTypeError, "wrong argument type %s (expected String or Regexp)",
 		rb_obj_classname(str2));
     }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18933)
+++ ChangeLog	(revision 18934)
@@ -1,6 +1,12 @@
+Sat Aug 30 08:09:36 2008  NARUSE, Yui  <naruse@r...>
+
+	* encoding.c (enc_compatible_p): use TYPE not BUILTIN_TYPE.
+	  [ruby-dev:36048]
+
 Sat Aug 30 07:48:48 2008  NARUSE, Yui  <naruse@r...>
 
 	* encoding.c (enc_compatible_p): add SPECIAL_CONST_P check.
+	  [ruby-dev:36048]
 
 	* test/ruby/test_m17n.rb (test_compatible): fix test.
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/