2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b539661c02..58cee2cc8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 10 04:54:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_define_class): raise TypeError same as class
+	  statement.  [ruby-core:27504]
+
 Sun Jan 10 04:41:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): needs ARCH_FLAG.
diff --git a/class.c b/class.c
index 056e1715be..599cbd689e 100644
--- a/class.c
+++ b/class.c
@@ -441,7 +441,7 @@ rb_define_class(const char *name, VALUE super)
 	    rb_raise(rb_eTypeError, "%s is not a class", name);
 	}
 	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
-	    rb_name_error(id, "%s is already defined", name);
+	    rb_raise(rb_eTypeError, "superclass mismatch for class %s", name);
 	}
 	return klass;
     }