diff options
| author | Andrew Haley <aph@redhat.com> | 2007-02-06 09:44:53 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2007-02-06 09:44:53 +0000 |
| commit | 426147a1e8ca92e3c32168f50dc9a2d04825c42c (patch) | |
| tree | 30e2c1c146f61967acae1fba982b261f8fe11855 /libjava/classpath/tools/gnu | |
| parent | 03d3e95382e636baa43e1ad0b635c427615cc16a (diff) | |
| download | gcc-426147a1e8ca92e3c32168f50dc9a2d04825c42c.zip gcc-426147a1e8ca92e3c32168f50dc9a2d04825c42c.tar.gz gcc-426147a1e8ca92e3c32168f50dc9a2d04825c42c.tar.bz2 | |
re PR cp-tools/30706 (gjavah incompatible with sun javah and gcjh)
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.
From-SVN: r121641
Diffstat (limited to 'libjava/classpath/tools/gnu')
| -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 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java index f29bfc3..5666d27 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 4e78710..758ec21 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(); |