jni.h (classpath 0.12)

[Alkis Evlogimenos]

At line 115 of jni.h: typedef void* jobject;

This type definition conflicts with any implementation dependent type 
definition given by the vm when _JNI_VM_INTERNAL_TYPES_DEFINED. Should this 
definition be in an else block when _JNI_VM_INTERNAL_TYPES_DEFINED?

Here's the proposed patch:

--- jni.h       2004-11-21 08:47:10.361939648 -0600
+++ /tmp/classpath-0.12/include/jni.h   2004-11-14 17:41:18.000000000 -0600
@@ -72,12 +72,8 @@
 struct _jmethodID;
 typedef struct _jfieldID *jfieldID;
 typedef struct _jmethodID *jmethodID;
-#else
-typedef void *jobject;
-typedef void *jfieldID;
-typedef void *jmethodID;
-#endif /* _JNI_VM_INTERNAL_TYPES_DEFINED */
-
+#endif
+
 #ifdef __cplusplus

 class _jobject {};
@@ -116,6 +112,7 @@
 #else /* __cplusplus */


+typedef void *jobject;
 typedef jobject jclass;
 typedef jobject jstring;
 typedef jobject jarray;

Thanks,

-- 

Alkis