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 d8310a0db5d6f36c737b25d9d71b01bc66330a1d..aad92c7f08d633f6d69f08d563fd100b25840492 100644 (file)
--- 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 e232a168d142b1f02045fc18112b836be8936aaa..ca38b9e92f970b2ac25f113897f8720fd10a7964 100644 (file)
--- 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);