* variable.c (rb_path2class): should not use rb_eval_string().

* marshal.c (w_extended): should allow marshaling of object which
  is extended by named module.

* class.c (rb_make_metaclass): super may be T_ICLASS, need to skip.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/class.c b/class.c
index 65187f50d0..9d9d3660ca 100644
--- a/class.c
+++ b/class.c
@@ -150,7 +150,7 @@ rb_make_metaclass(obj, super)
     if (BUILTIN_TYPE(obj) == T_CLASS) {
 	RBASIC(klass)->klass = klass;
 	if (FL_TEST(obj, FL_SINGLETON)) {
-	    RCLASS(klass)->super = RBASIC(RCLASS(obj)->super)->klass;
+	    RCLASS(klass)->super = RBASIC(rb_class_real(RCLASS(obj)->super))->klass;
 	}
     }