re PR java/8296 (gcjh generates incorrect JNI header)

	* gjavah.c (decode_signature_piece): In JNI mode, print
	`jobjectArray' when array depth is nonzero.
	Fixes PR java/8296.

From-SVN: r58474

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index cdfbd2c..26e44c4 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-23  Tom Tromey  <tromey@redhat.com>
+
+       * gjavah.c (decode_signature_piece): In JNI mode, print
+       `jobjectArray' when array depth is nonzero.
+       Fixes PR java/8296.
+
 2002-10-15  Andrew Haley  <aph@redhat.com>
 
        * parse.y (patch_invoke): Call force_evaluation_order on a static

diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 53099ad..3d7e32e 100644 (file)
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -1289,7 +1289,7 @@ decode_signature_piece (stream, signature, limit, need_space)
       /* If the previous iterations left us with something to print,
         print it.  For JNI, we always print `jobjectArray' in the
         nested cases.  */
-      if (flag_jni && ctype == NULL)
+      if (flag_jni && (ctype == NULL || array_depth > 0))
        {
          ctype = "jobjectArray";
          *need_space = 1;