diff options
Diffstat (limited to 'libjava/defineclass.cc')
| -rw-r--r-- | libjava/defineclass.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc index 7ddead0965b..06ca16274ea 100644 --- a/libjava/defineclass.cc +++ b/libjava/defineclass.cc @@ -43,11 +43,6 @@ details. */ #include <java/lang/IncompatibleClassChangeError.h> #include <java/lang/reflect/Modifier.h> -#define ClassClass _CL_Q34java4lang5Class -extern java::lang::Class ClassClass; -#define ClassObject _CL_Q34java4lang6Object -extern java::lang::Class ClassObject; - // we don't verify method names that match these. static _Jv_Utf8Const *clinit_name = _Jv_makeUtf8Const ("<clinit>", 8); static _Jv_Utf8Const *init_name = _Jv_makeUtf8Const ("<init>", 6); @@ -864,11 +859,12 @@ _Jv_ClassReader::handleClassBegin // interfaces have java.lang.Object as super. if (access_flags & Modifier::INTERFACE) { - def->superclass = (jclass)&ClassObject; + def->superclass = (jclass)&java::lang::Class::class$; } // FIXME: Consider this carefully! - else if (!_Jv_equalUtf8Consts (def->name, ClassObject.name)) + else if (!_Jv_equalUtf8Consts (def->name, + java::lang::Class::class$.name)) { throw_no_class_def_found_error ("loading java.lang.Object"); } |