procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR cp-tools/30706 (gjavah incompatible with sun javah and gcjh)

Browse source 
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
This commit is contained in:
Andrew Haley 2007-02-06 09:44:53 +00:00 • committed by Andrew Haley
parent 03d3e95382
commit 426147a1e8
5 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libjava/classpath/ChangeLog
View file

@ -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.

BIN
libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class
View file

Binary file not shown.

BIN
libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class
View file

Binary file not shown.

4
libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
View file

@ -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();

6
libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java
View file

@ -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();