From 426147a1e8ca92e3c32168f50dc9a2d04825c42c Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Tue, 6 Feb 2007 09:44:53 +0000 Subject: re PR cp-tools/30706 (gjavah incompatible with sun javah and gcjh) 2007-02-05 Andrew Haley 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 --- libjava/classpath/ChangeLog | 8 ++++++++ .../gnu/classpath/tools/javah/JniIncludePrinter.class | Bin 4343 -> 4407 bytes .../gnu/classpath/tools/javah/JniStubPrinter.class | Bin 3407 -> 3478 bytes .../gnu/classpath/tools/javah/JniIncludePrinter.java | 4 +++- .../gnu/classpath/tools/javah/JniStubPrinter.java | 6 ++++-- 5 files changed, 15 insertions(+), 3 deletions(-) (limited to 'libjava/classpath') diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index f82f64a..6cd3239 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,11 @@ +2007-02-05 Andrew Haley + + 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 * 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 index 5124ee9..6c29cc3 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class index 9f82c33..ad96207 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class differ 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(); -- cgit v1.1