[cp-patches] Patch: FYI: jni.h fixlet

[Tom Tromey]

I'm checking this in on the trunk.  I'm also putting a small variant
of this patch in Classpath.

This patch fixes a minor bug in jni.h, as reported here:

  http://article.gmane.org/gmane.comp.version-control.subversion.devel/52691

Kaffe guys, you will want something like this as well (the bug report
is actually against kaffe).  Some day we'll really just have a single
version of jni.h...

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * jni.cc (_Jv_JNI_NewObjectArray): Fixed return type.
        * include/jni.h (struct JNINativeInterface) <NewObjectArray>: Now
        returns jobjectArray.
        (_Jv_JNIEnv::NewObjectArray): Likewise.

Index: jni.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni.cc,v
retrieving revision 1.88
diff -u -r1.88 jni.cc
--- jni.cc 14 Oct 2004 20:36:37 -0000 1.88
+++ jni.cc 3 Nov 2004 22:45:08 -0000
@@ -1396,7 +1396,7 @@
   return unwrap (array)->length;
 }
 
-static jarray JNICALL
+static jobjectArray JNICALL
 _Jv_JNI_NewObjectArray (JNIEnv *env, jsize length, 
                        jclass elementClass, jobject init)
 {
@@ -1407,7 +1407,7 @@
 
       _Jv_CheckCast (elementClass, init);
       jarray result = JvNewObjectArray (length, elementClass, init);
-      return (jarray) wrap_value (env, result);
+      return (jobjectArray) wrap_value (env, result);
     }
   catch (jthrowable t)
     {
Index: include/jni.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/include/jni.h,v
retrieving revision 1.27
diff -u -r1.27 jni.h
--- include/jni.h 14 May 2004 16:35:07 -0000 1.27
+++ include/jni.h 3 Nov 2004 22:45:08 -0000
@@ -555,7 +555,7 @@
   const char * (JNICALL *GetStringUTFChars) (JNIEnv *, jstring, jboolean *);
   void     (JNICALL *ReleaseStringUTFChars) (JNIEnv *, jstring, const char *);
   jsize    (JNICALL *GetArrayLength)       (JNIEnv *, jarray);
-  jarray   (JNICALL *NewObjectArray)       (JNIEnv *, jsize, jclass, jobject);
+  jobjectArray (JNICALL *NewObjectArray)    (JNIEnv *, jsize, jclass, jobject);
   jobject  (JNICALL *GetObjectArrayElement) (JNIEnv *, jobjectArray, jsize);
   void     (JNICALL *SetObjectArrayElement) (JNIEnv *, jobjectArray, jsize,
                                             jobject);
@@ -1380,7 +1380,7 @@
   jsize GetArrayLength (jarray val0)
   { return p->GetArrayLength (this, val0); }
 
-  jarray NewObjectArray (jsize val0, jclass cl1, jobject obj2)
+  jobjectArray NewObjectArray (jsize val0, jclass cl1, jobject obj2)
   { return p->NewObjectArray (this, val0, cl1, obj2); }
 
   jobject GetObjectArrayElement (jobjectArray val0, jsize val1)