aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorTom Tromey <tromey@cygnus.com>1999-12-17 20:25:59 +0000
committerTom Tromey <tromey@gcc.gnu.org>1999-12-17 20:25:59 +0000
commit6f19291ada20466ce169521e7db69cb8da3affb0 (patch)
tree89f01c81a083befe0fad8721ab3c8b3687704455 /gcc
parentce63fdce9080eb70b72c8631f0c2ff6a64148f37 (diff)
downloadgcc-6f19291ada20466ce169521e7db69cb8da3affb0.zip
gcc-6f19291ada20466ce169521e7db69cb8da3affb0.tar.gz
gcc-6f19291ada20466ce169521e7db69cb8da3affb0.tar.bz2
re GNATS gcj/119 (gcjh needs to output space before leading "::" with JArray's)
* gjavah.c (decode_signature_piece): Print "::" in JArray<>. This fixes PR gcj/119. (process_file): Use `\n\' at end of each line in string. From-SVN: r30997
Diffstat (limited to 'gcc')
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/gjavah.c13
2 files changed, 13 insertions, 6 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 2f8941d..e023857 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+1999-12-17 Tom Tromey <tromey@cygnus.com>
+
+ * gjavah.c (decode_signature_piece): Print "::" in JArray<>. This
+ fixes PR gcj/119.
+ (process_file): Use `\n\' at end of each line in string.
+
Tue Dec 14 14:20:16 1999 Per Bothner <per@bothner.com>
* class.c (make_class_data): flag_keep_inline_functions to keep
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index a29cb62..12cb72b 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -726,7 +726,8 @@ decode_signature_piece (stream, signature, limit, need_space)
/* We have to generate a reference to JArray here, so that
our output matches what the compiler does. */
++signature;
- fputs ("JArray<", stream);
+ /* Space between `<' and `:' to avoid C++ digraphs. */
+ fputs ("JArray< ::", stream);
while (signature < limit && *signature != ';')
{
int ch = UTF8_GET (signature, limit);
@@ -1357,11 +1358,11 @@ DEFUN(process_file, (jcf, out),
out);
else
{
- fputs ("// This file was created by `gcjh -stubs'. It is -*- c++ -*-.
-//
-// This file is intended to give you a head start on implementing native
-// methods using CNI.
-// Be aware: running `gcjh -stubs' once more for this class may overwrite any
+ fputs ("// This file was created by `gcjh -stubs'. It is -*- c++ -*-.\n\
+//\n\
+// This file is intended to give you a head start on implementing native\n\
+// methods using CNI.\n\
+// Be aware: running `gcjh -stubs' once more for this class may overwrite any\n\
// edits you have made to this file.\n\n", out);
}
}