2006-10-29 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD --> generics for 2006/10/04-2006/10/29.

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/gnu/classpath/tools/javah/JniStubPrinter.java b/tools/gnu/classpath/tools/javah/JniStubPrinter.java
index 0bc11873f..4e7871008 100644
--- a/tools/gnu/classpath/tools/javah/JniStubPrinter.java
+++ b/tools/gnu/classpath/tools/javah/JniStubPrinter.java
@@ -76,12 +76,12 @@ public class JniStubPrinter
     if (! klass.hasNativeMethod())
       return;
     String xname = JniHelper.mangle(klass.name);
-    JniPrintStream out = (JniPrintStream) getPrintStream(xname + ".c", klass);
+    JniPrintStream out = (JniPrintStream) getPrintStream(klass.name + ".c", klass);
     if (out == null)
       return;
     out.println();
     out.print("#include <");
-    out.print(xname);
+    out.print(klass.name);
     out.println(".h>");
 
     Iterator i = klass.methods.iterator();