From 0d3911c90471542df4a1c9bf94aad0747a70d857 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 23 Oct 2002 22:47:31 +0000 Subject: [PATCH] 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 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/gjavah.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index cdfbd2c86cc..26e44c49296 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2002-10-23 Tom Tromey + + * gjavah.c (decode_signature_piece): In JNI mode, print + `jobjectArray' when array depth is nonzero. + Fixes PR java/8296. + 2002-10-15 Andrew Haley * parse.y (patch_invoke): Call force_evaluation_order on a static diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c index 53099ad3876..3d7e32e0022 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; -- 2.30.2