* src/native/include/Makefile.am (COMMON_HEADER_FILES): Removed

java_util_Vector.h.
* src/native/jvmti/jvmti.c (native/include/java_util_Vector.h):
Removed.
* src/native/vm/gnuclasspath/java_lang_VMClassLoader.c
(native/include/java_util_Vector.h): Likewise.
(Java_java_lang_VMClassLoader_nativeGetResources): Added struct to
return type.

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index a2fdacf13bd644a4929861072a4f3cba57616967..8dbd8bff0d91c54c33e616b3c87f347063b8af25 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -41,8 +41,7 @@ COMMON_HEADER_FILES = \
        java_lang_Float.h \
        java_lang_Integer.h \
        java_lang_Long.h \
-       java_lang_Short.h \
-       java_util_Vector.h
+       java_lang_Short.h
 
 JAVASE_HEADER_FILES = \
        java_lang_ClassLoader.h \

diff --git a/src/native/jvmti/jvmti.c b/src/native/jvmti/jvmti.c
index 55da5cb01cc0f92b2063f9bf15f60c60c08e7074..e4f5dd2597779c4c5a4e207454c3f16d4491b571 100644 (file)
--- a/src/native/jvmti/jvmti.c
+++ b/src/native/jvmti/jvmti.c
@@ -56,7 +56,6 @@
 #include "threads/thread.h"
 #include "threads/lock-common.h"
 #include "vm/exceptions.h"
-#include "native/include/java_util_Vector.h"
 #include "native/include/java_io_PrintStream.h"
 #include "native/include/java_io_InputStream.h"
 #include "native/include/java_lang_Cloneable.h"

diff --git a/src/native/vm/gnuclasspath/java_lang_VMClassLoader.c b/src/native/vm/gnuclasspath/java_lang_VMClassLoader.c
index 6f6547b91641c81f1177cc27c596666c25a9d71d..b8af074be20395b03daff46c05eba4678da53c73 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMClassLoader.c
+++ b/src/native/vm/gnuclasspath/java_lang_VMClassLoader.c
@@ -38,7 +38,6 @@
 #include "native/include/java_lang_String.h"
 #include "native/include/java_security_ProtectionDomain.h"  /* required by... */
 #include "native/include/java_lang_ClassLoader.h"
-#include "native/include/java_util_Vector.h"
 #include "native/include/java_util_HashMap.h"
 #include "native/include/java_util_Map.h"
 #include "native/include/java_lang_Boolean.h"
@@ -273,7 +272,7 @@ JNIEXPORT java_lang_Class* JNICALL Java_java_lang_VMClassLoader_loadClass(JNIEnv
  * Method:    nativeGetResources
  * Signature: (Ljava/lang/String;)Ljava/util/Vector;
  */
-JNIEXPORT java_util_Vector* JNICALL Java_java_lang_VMClassLoader_nativeGetResources(JNIEnv *env, jclass clazz, java_lang_String *name)
+JNIEXPORT struct java_util_Vector* JNICALL Java_java_lang_VMClassLoader_nativeGetResources(JNIEnv *env, jclass clazz, java_lang_String *name)
 {
        java_handle_t        *o;         /* vector being created     */
        methodinfo           *m;         /* "add" method of vector   */
@@ -403,7 +402,7 @@ JNIEXPORT java_util_Vector* JNICALL Java_java_lang_VMClassLoader_nativeGetResour
 
        MFREE(buffer, char, bufsize);
 
-       return (java_util_Vector *) o;
+       return (struct java_util_Vector *) o;
 
 return_NULL:
        MFREE(buffer, char, bufsize);