From: Tom Tromey <tromey@cygnus.com>
Date: Wed, 8 Nov 2000 20:33:37 +0000 (+0000)
Subject: gjavah.c (process_file): Only include gcj/cni.h when generating CNI stubs.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=136c35df1c6a37c2f831db88221178b091b7e50f;p=gcc.git

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 f4eff5346c3..b10ac43d57f 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 6e6075ea0ff..3b9cee5313e 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);
 	}
     }