diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/classpath/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class | bin | 4343 -> 4407 bytes | |||
| -rw-r--r-- | libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class | bin | 3407 -> 3478 bytes | |||
| -rw-r--r-- | libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java | 4 | ||||
| -rw-r--r-- | libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java | 6 |
5 files changed, 15 insertions, 3 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index f82f64ab993..6cd323902d9 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,11 @@ +2007-02-05 Andrew Haley <aph@redhat.com> + + PR cp-tools/30706 + * tools/gnu/classpath/tools/javah/JniIncludePrinter.java: + (printClass): Replace '/' in filenames with '_'. + * tools/gnu/classpath/tools/javah/JniStubPrinter.java + (printClass): Likewise. + 2007-02-05 Tom Tromey <tromey@redhat.com> * java/net/Proxy.java (equals): Handle case where address==null. diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class Binary files differindex 5124ee9cbab..6c29cc3c22b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class Binary files differindex 9f82c33ee84..ad9620710b8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java index f29bfc30050..5666d277d57 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java @@ -112,7 +112,9 @@ public class JniIncludePrinter if (! klass.hasNativeMethod()) return; String xname = JniHelper.mangle(klass.name); - JniPrintStream out = (JniPrintStream) getPrintStream(klass.name + ".h", klass); + JniPrintStream out + = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".h", + klass); if (out == null) return; out.println(); diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java index 4e7871008d7..758ec21c091 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java @@ -76,12 +76,14 @@ public class JniStubPrinter if (! klass.hasNativeMethod()) return; String xname = JniHelper.mangle(klass.name); - JniPrintStream out = (JniPrintStream) getPrintStream(klass.name + ".c", klass); + JniPrintStream out + = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".c", + klass); if (out == null) return; out.println(); out.print("#include <"); - out.print(klass.name); + out.print(klass.name.replace('/', '_')); out.println(".h>"); Iterator i = klass.methods.iterator(); |
