diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | tools/gnu/classpath/tools/javah/JniHelper.java | 2 |
2 files changed, 9 insertions, 0 deletions
@@ -1,5 +1,12 @@ 2011-07-07 Andrew John Hughes <ahughes@redhat.com> + PR classpath/45527 + * tools/gnu/classpath/tools/javah/JniHelper.java: + (mangle(String)): Replace '$' with '_' rather than + encoding it as hex. + +2011-07-07 Andrew John Hughes <ahughes@redhat.com> + PR classpath/40188 * tools/gnu/classpath/tools/javah/JniIncludePrinter.java: (writeFields(ClassWrapper,JniPrintStream)): Retain a diff --git a/tools/gnu/classpath/tools/javah/JniHelper.java b/tools/gnu/classpath/tools/javah/JniHelper.java index 9225444be..9a723cadf 100644 --- a/tools/gnu/classpath/tools/javah/JniHelper.java +++ b/tools/gnu/classpath/tools/javah/JniHelper.java @@ -104,6 +104,8 @@ public class JniHelper result.append("_3"); else if (c == '/') result.append("_"); + else if (c == '$') + result.append("_"); else if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) result.append(c); |