gjavah.c (process_file): Only include gcj/cni.h when generating CNI stubs.

	* gjavah.c (process_file): Only include gcj/cni.h when generating
	CNI stubs.

From-SVN: r37325

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index f4eff5346c331964b72545b2621ef3ebbb949b57..b10ac43d57f027c96c88730145ddb4d4de148cd1 100644 (file)
--- 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 6e6075ea0ffdda3e1ab30bfc6c4f3a01f0703ff6..3b9cee5313ef3a002e57275178610e00b7127c08 100644 (file)
--- 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);
        }
     }