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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121641 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index f82f64ab993e54231806fd11434a8e17fca343d6..6cd323902d99e867349d64bf115cd93fc5f5d119 100644 (file)
--- 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
index 5124ee9cbab434945b12681da057cacbd50142c4..6c29cc3c22b3e8e578d8dc32393b56a08f1c4bb8 100644 (file)
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 9f82c33ee84f6d5bfc32fe597afcc6bc8e260a5c..ad9620710b8c8194d7541ada72beca3a2d292563 100644 (file)
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 f29bfc30050fc5bcac139a11b144070d3543d90e..5666d277d5718b36ce778e3101d59cc539ac7598 100644 (file)
--- 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 4e7871008d7d5972f1833d5b5e50a602fd3f4c30..758ec21c091ab9bb5a38be588a67ac8721252d04 100644 (file)
--- 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();