From: Tom Tromey <tromey@redhat.com>
Date: Wed, 2 Feb 2005 00:44:08 +0000 (+0000)
Subject: re PR java/19742 (gcjh shouldn't mangle names in JNI output.)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d4da704e7af99d07c27b934d5e89b659230b51f;p=gcc.git

re PR java/19742 (gcjh shouldn't mangle names in JNI output.)

	PR java/19742:
	* gjavah.c (get_field_name): Don't override name for JNI header.

From-SVN: r94578
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index d8310a0db5d..aad92c7f08d 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-01  Tom Tromey  <tromey@redhat.com>
+
+	PR java/19742:
+	* gjavah.c (get_field_name): Don't override name for JNI header.
+
 2005-02-01  Roger Sayle  <roger@eyesopen.com>
 
 	* jcf-write.c (generate_bytecode_insns): Implement RSHIFT_EXPR
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index e232a168d14..ca38b9e92f9 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -706,6 +706,8 @@ get_field_name (JCF *jcf, int name_index, JCF_u2 flags)
       memcpy (override, name, length);
       strcpy (override + length, "__");
     }
+  else if (flag_jni)
+    override = NULL;
   else
     override = cxx_keyword_subst (name, length);