aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/gjavah.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index f4eff53..b10ac43 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-08 Tom Tromey <tromey@cygnus.com>
+
+ * gjavah.c (process_file): Only include gcj/cni.h when generating
+ CNI stubs.
+
2000-11-07 Joseph S. Myers <jsm28@cam.ac.uk>
* expr.c (note_instructions), jcf-io.c (find_class), jcf-parse.c
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 6e6075e..3b9cee5 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -1766,7 +1766,8 @@ DEFUN(process_file, (jcf, out),
if (len > 6 && ! strcmp (&jcf->classname[len - 6], ".class"))
len -= 6;
print_include (out, jcf->classname, len);
- print_include (out, "gcj/cni", -1);
+ if (! flag_jni)
+ print_include (out, "gcj/cni", -1);
}
}