From 3c0df61ec07b24475d3ac25fdc3f263fa1db3544 Mon Sep 17 00:00:00 2001 From: Christian Thalinger Date: Sun, 29 Jun 2008 16:47:56 +0200 Subject: [PATCH] * 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. --- src/native/include/Makefile.am | 3 +-- src/native/jvmti/jvmti.c | 1 - src/native/vm/gnuclasspath/java_lang_VMClassLoader.c | 5 ++--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am index a2fdacf13..8dbd8bff0 100644 --- 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 55da5cb01..e4f5dd259 100644 --- 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 6f6547b91..b8af074be 100644 --- 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); -- 2.25.1