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

gcc/java/ChangeLog

+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

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);