* src/native/vm/gnu/java_lang_VMClass.c (getSuperclass): Use

class_get_superclass.
* src/native/vm/java_lang_Class.c (getSuperclass): Removed.
* src/native/vm/java_lang_Class.h: Likewise.

diff --git a/src/native/vm/gnu/java_lang_VMClass.c b/src/native/vm/gnu/java_lang_VMClass.c
index 159309f311a7fd9ac75815eab0baea0f9802429b..c5e1fef638f9420ce625df2b55ae391922ef5b99 100644 (file)
--- a/src/native/vm/gnu/java_lang_VMClass.c
+++ b/src/native/vm/gnu/java_lang_VMClass.c
@@ -165,7 +165,14 @@ JNIEXPORT java_lang_String* JNICALL Java_java_lang_VMClass_getName(JNIEnv *env,
  */
 JNIEXPORT java_lang_Class* JNICALL Java_java_lang_VMClass_getSuperclass(JNIEnv *env, jclass clazz, java_lang_Class *klass)
 {
-       return _Jv_java_lang_Class_getSuperclass(klass);
+       classinfo *c;
+       classinfo *super;
+
+       c = LLNI_classinfo_unwrap(klass);
+
+       super = class_get_superclass(c);
+
+       return LLNI_classinfo_wrap(super);
 }
 
 

diff --git a/src/native/vm/java_lang_Class.c b/src/native/vm/java_lang_Class.c
index 193ff829ab4a047bf2b81c0d1a8d304b2bf3c273..347196aa8f68c71a8f8d190ad80664fe8c711591 100644 (file)
--- a/src/native/vm/java_lang_Class.c
+++ b/src/native/vm/java_lang_Class.c
@@ -261,24 +261,6 @@ JNIEXPORT int32_t JNICALL _Jv_java_lang_Class_isInterface(JNIEnv *env, java_lang
 
 #if defined(ENABLE_JAVASE)
 
-/*
- * Class:     java/lang/Class
- * Method:    getSuperclass
- * Signature: ()Ljava/lang/Class;
- */
-java_lang_Class *_Jv_java_lang_Class_getSuperclass(java_lang_Class *klass)
-{
-       classinfo *c;
-       classinfo *super;
-
-       c = LLNI_classinfo_unwrap(klass);
-
-       super = class_get_superclass(c);
-
-       return LLNI_classinfo_wrap(super);
-}
-
-
 /*
  * Class:     java/lang/Class
  * Method:    getInterfaces

diff --git a/src/native/vm/java_lang_Class.h b/src/native/vm/java_lang_Class.h
index b97aea384344723d01ababa464071f9cd5b09217..7293597462fa860f904aa89b436d6b26602f5dc1 100644 (file)
--- a/src/native/vm/java_lang_Class.h
+++ b/src/native/vm/java_lang_Class.h
@@ -63,7 +63,6 @@ s4                             _Jv_java_lang_Class_isAssignableFrom(java_lang_Cl
 JNIEXPORT int32_t JNICALL      _Jv_java_lang_Class_isInterface(JNIEnv *env, java_lang_Class *this);
 
 #if defined(ENABLE_JAVASE)
-java_lang_Class               *_Jv_java_lang_Class_getSuperclass(java_lang_Class *klass);
 java_handle_objectarray_t     *_Jv_java_lang_Class_getInterfaces(java_lang_Class *klass);
 s4                             _Jv_java_lang_Class_getModifiers(java_lang_Class *klass, s4 ignoreInnerClassesAttrib);
 java_handle_objectarray_t     *_Jv_java_lang_Class_getDeclaredClasses(java_lang_Class *klass, s4 publicOnly);