aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2007-02-06 20:27:16 +0000
committerTom Tromey <tromey@gcc.gnu.org>2007-02-06 20:27:16 +0000
commit4aa9ca50496b6dd5bc3a2ea4e71e1accef55f74b (patch)
treef8a9b0f61ef06279d8bc8181ae535df458ccea64
parentad8e8d0b465e6dd9d9db4988de7b5c524bb4d85d (diff)
downloadgcc-4aa9ca50496b6dd5bc3a2ea4e71e1accef55f74b.zip
gcc-4aa9ca50496b6dd5bc3a2ea4e71e1accef55f74b.tar.gz
gcc-4aa9ca50496b6dd5bc3a2ea4e71e1accef55f74b.tar.bz2
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
-rw-r--r--libjava/classpath/ChangeLog6
-rw-r--r--libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.classbin4407 -> 4363 bytes
-rw-r--r--libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java4
3 files changed, 7 insertions, 3 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 6cd3239..efc1512 100644
--- 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 6c29cc3..a89e0d2 100644
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class
+++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class
Binary files differ
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
index 5666d27..dc19af2 100644
--- 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",