diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/gjavah.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index d8310a0..aad92c7 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 e232a16..ca38b9e 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); |