re PR cp-tools/30707 (gjavah cannot handle more than one CLASS)

	PR libgcj/30707:
	* tools/gnu/classpath/tools/javah/JniIncludePrinter.java
	(printClass): Always print a header.

From-SVN: r121664

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 6cd323902d99e867349d64bf115cd93fc5f5d119..efc151209660850eff3529e8e9de9a9b302b7463 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-06  Tom Tromey  <tromey@redhat.com>
+
+       PR libgcj/30707:
+       * tools/gnu/classpath/tools/javah/JniIncludePrinter.java
+       (printClass): Always print a header.
+
 2007-02-05  Andrew Haley  <aph@redhat.com>
 
        PR cp-tools/30706

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 6c29cc3c22b3e8e578d8dc32393b56a08f1c4bb8..a89e0d2e9a81c37a11c65fae9aa007e58c58f561 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/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
index 5666d277d5718b36ce778e3101d59cc539ac7598..dc19af255168353d30293e8b9bae016c8f344a5e 100644 (file)
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
@@ -1,5 +1,5 @@
 /* JniIncludePrinter.java - Generate a JNI header file
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -109,8 +109,6 @@ public class JniIncludePrinter
 
   public void printClass(ClassWrapper klass) throws IOException
   {
-    if (! klass.hasNativeMethod())
-      return;
     String xname = JniHelper.mangle(klass.name);
     JniPrintStream out 
       = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".h",