[kaffe] CVS kaffe (dalibor): Fixes for Resin: Added JavaVMOption, and typedefed some JNI structs

[Kaffe CVS]

PatchSet 4512 
Date: 2004/03/12 16:56:56
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixes for Resin: Added JavaVMOption, and typedefed some JNI structs

2004-03-12  Dalibor Topic <robilad at kaffe.org>

        * include/jni.h:
        (JavaVMOption) New struct.
        (JavaVMInitArgs, JavaVMAttachArgs) Use typedefs.

        Reported by: Jim Huang <jimchyun at ccns.ncku.edu.tw>

Members: 
	ChangeLog:1.2091->1.2092 
	include/jni.h:1.26->1.27 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2091 kaffe/ChangeLog:1.2092
--- kaffe/ChangeLog:1.2091	Fri Mar 12 11:45:17 2004
+++ kaffe/ChangeLog	Fri Mar 12 16:56:56 2004
@@ -1,5 +1,13 @@
 2004-03-12  Dalibor Topic <robilad at kaffe.org>
 
+	* include/jni.h:
+	(JavaVMOption) New struct.
+	(JavaVMInitArgs, JavaVMAttachArgs) Use typedefs.
+
+	Reported by: Jim Huang <jimchyun at ccns.ncku.edu.tw>
+
+2004-03-12  Dalibor Topic <robilad at kaffe.org>
+
 	* config/sparc/atomicity-sparc32.h,
 	config/sparc/atomicity-sparc32v9.h,
 	config/sparc/atomicity-sparc64.h:
Index: kaffe/include/jni.h
diff -u kaffe/include/jni.h:1.26 kaffe/include/jni.h:1.27
--- kaffe/include/jni.h:1.26	Wed Jan  7 19:01:00 2004
+++ kaffe/include/jni.h	Fri Mar 12 16:56:58 2004
@@ -36,8 +36,41 @@
 struct JNINativeInterface;
 struct JavaVM_;
 struct JNINativeMethod_;
-struct JavaVMAttachArgs;
-struct JavaVMInitArgs;
+
+typedef struct JavaVMAttachArgs {
+  void*	reserved0;
+} JavaVMAttachArgs;
+
+typedef struct JavaVMOption
+{
+  char *optionString;
+  void *extraInfo;
+} JavaVMOption;
+
+typedef struct JavaVMInitArgs {
+	jint		version;
+	char**		properties;
+	jint		checkSource;
+	jint		nativeStackSize;
+	jint		javaStackSize;
+	jint		minHeapSize;
+	jint		maxHeapSize;
+	jint		verifyMode;
+	const char*	classpath;
+	const char*     bootClasspath;
+	jint		(*vfprintf)(FILE*, const char*, va_list);
+	void		(*exit)(jint) __NORETURN__;
+	void		(*abort)(void) __NORETURN__;
+	jint		enableClassGC;
+	jint		enableVerboseGC;
+	jint		disableAsyncGC;
+	jint		enableVerboseClassloading;
+	jint		enableVerboseJIT;
+	jint		enableVerboseCall;
+	jint		allocHeapSize;
+	const char*	classhome;
+	const char*	libraryhome;
+} JavaVMInitArgs;
 
 #if defined(__cplusplus)
 typedef JNIEnv_ JNIEnv;
@@ -49,7 +82,6 @@
 
 typedef struct JNINativeMethod_ JNINativeMethod;
 typedef struct JavaVMAttachArgs ThreadAttachArgs;
-typedef struct JavaVMInitArgs JavaVMInitArgs;
 
 typedef	void*	jobjectID;
 typedef	void*	jmethodID;
@@ -309,10 +341,6 @@
         void* reserved22; /* GetDirectBufferCapacity */
 };
 
-struct JavaVMAttachArgs {
-	void*	reserved0;
-};
-
 struct JNINativeMethod_ {
 	char*	name;
 	char*	signature;
@@ -553,31 +581,6 @@
         jint    DetachCurrentThread(void);
         jint    GetEnv(void**, jint);
 #endif
-};
-
-struct JavaVMInitArgs {
-	jint		version;
-	char**		properties;
-	jint		checkSource;
-	jint		nativeStackSize;
-	jint		javaStackSize;
-	jint		minHeapSize;
-	jint		maxHeapSize;
-	jint		verifyMode;
-	const char*	classpath;
-	const char*     bootClasspath;
-	jint		(*vfprintf)(FILE*, const char*, va_list);
-	void		(*exit)(jint) __NORETURN__;
-	void		(*abort)(void) __NORETURN__;
-	jint		enableClassGC;
-	jint		enableVerboseGC;
-	jint		disableAsyncGC;
-	jint		enableVerboseClassloading;
-	jint		enableVerboseJIT;
-	jint		enableVerboseCall;
-	jint		allocHeapSize;
-	const char*	classhome;
-	const char*	libraryhome;
 };
 
 extern JavaVMInitArgs Kaffe_JavaVMArgs[];