aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2002-10-23 22:47:31 +0000
committerTom Tromey <tromey@gcc.gnu.org>2002-10-23 22:47:31 +0000
commit0d3911c90471542df4a1c9bf94aad0747a70d857 (patch)
tree03b604ccbd087846af746584fdf96ceccbd87b0b /gcc
parent8bfb45f8641711f0ae29c8401d8e7e7fafd08f5f (diff)
downloadgcc-0d3911c90471542df4a1c9bf94aad0747a70d857.zip
gcc-0d3911c90471542df4a1c9bf94aad0747a70d857.tar.gz
gcc-0d3911c90471542df4a1c9bf94aad0747a70d857.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/gjavah.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index cdfbd2c..26e44c4 100644
--- 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
--- 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;