From 4aa9ca50496b6dd5bc3a2ea4e71e1accef55f74b Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 6 Feb 2007 20:27:16 +0000
Subject: [PATCH] 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
---
 libjava/classpath/ChangeLog                   |   6 ++++++
 .../tools/javah/JniIncludePrinter.class       | Bin 4407 -> 4363 bytes
 .../tools/javah/JniIncludePrinter.java        |   4 +---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 6cd323902d99..efc151209660 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 6c29cc3c22b3e8e578d8dc32393b56a08f1c4bb8..a89e0d2e9a81c37a11c65fae9aa007e58c58f561 100644
GIT binary patch
delta 934
zc-mc(e@s<n7{@;^-g`OsaB_5;q*mJvrn!p;D%)ycE+JYrKu2!srn@t^;N1$03xbkf
zWwA=ijh$JEi9^(@WGRA&3zDJzu<VCcR%V)-ivRcrfB8=v_MCIa+}ykKyyyMC-}m``
zpZ9$Rv)i*X&rA%T0G{GjI%$gBj)gNjCLZi7JgjMD>@nzJuQk;_D|5dhEpLsE;()<H
zdaYuAP5h8T&xuyoRz<3V;jqT%LUQIK4lZD{Hsaz(6#?O;Xq9VUZ;Uyg#(?l5%?*+I
z+F*8ZwuY@xEgDIMFDFu46|MF&oneFHJgP{4Bhs*@t}2$!7mCO0>TB|?9^XUOeBF3)
zgt<CTGHP&=XB1jAR=&C+x-O#el_<PYzNlpRlEoEEgMLQ%#^75@6rQR`tWxJY&ZP6b
zBFj3fXL${N;72Q=7yEuTsOGFSt_L6aMd1%hlH!G>r9quaeslKDE1sKUb@`@?1Kldi
zc)0KnabM`%&;^5OWNBO!V57z*g^?;Jm>+WQ;~#}L91e!^oorVPuJ!NEXqpoD;S7{7
zcYvZKFO`Lk^TG;ek(r+vw&_k%I!HxepUpCxmAN*FQ7X&L(|Gz!n?^J6sm*KVTqguR
zv#BuyhwlSiR-e1o@5W<p9CTt_Hbrb`h{qHKo&-fRJVWFtMj0va&hQR!BFUGX_!7)9
z1E-v%4)}GF(>6bufpaND)P6Msze`5vc(bDO?y#d9$~6c1b5i}Ud%CWtzir}^PA{j>
zD}B<KY3LGr2}xXwMm@8M@r2AKZ<0p?Pt(Xe*6}P&JWn%4tmkDmP)-Z4@)j%D$SO9;
zO~;9{nL4(}iB@5~Eu)QhWLUgQSDg3gW-AHW>F0fh_&`eEChgM3IXXBmw2N%#Djzb&
zN8ILP#@WFgI{A;CO7V&EvWpC{x*+wC7(5^==WnyfOKUR0zm!N>d0Y@9txORUt*()2
S9ub(wb#CAl>P@%$vHt-RmG-Fs

delta 975
zc-mc(du$X{6vltI-F9bZ2Uu2V3YBDSA(FPkil`xNf<jXgNLvXZAi-o)+iAN|3Upgq
zt+-HpM2ZhGF=~AU6v|6Wp-#80Lh%KnA}_TlzUqUjiGLXX;IG1&S%?Xl%sF$v^PTT}
z_s;Fi@6QjN93MOa%;7IT8H%Fq3#M%!pWIv8qs_==r@>paD<(BmC#tHO;~T6>tGQuq
ztxhGo40h9P|EtXm?NwyVZqQNeH#opM_HBXsWRF5Gh}SjNT6K|FOruvwZa(bd0>&FH
z4}VV)7G9cGv+m)Rg!^jr3(sn6wwf9v`DOVU0}9oyF{H>Yuo`RQbpdkuz~BhCDEw<Y
zUkN|Mid)w<)kp1{gVW0b9Hm(2c0Mxrm^&3({MtS=J{A2XRg25-UwYrN<q?;8!r(K?
z6~0<4QKR!YU;6pNUZdw_p5iOJQ!mrc7}RlAkvGfU5xmL%TMy)&R|F!WQ?{U@BBE2n
zH!kN}#XOf&VBZnUDZL=pOWou7-e3wj8b1iIQR63tk={!rTIe0dFN&;KEK(SCm3}q&
z?eLahYi2TsY<W-<iyU@z;p;8xV_}L#m4!pxyUJaJqM?|>+bJsgSr*>ou+rfHVecEJ
zrpi1nEv7?@8GhH{L9^Hm;e!tKX86zzfXC|dN{$y(4oOLa*NQUi{Q;&cN_^ccoa!5(
zKrzhGlB}s&eH=^iVHerm%re8DxS}q2JjF?e(`NWw8j)#Vo8b`=blck$T~`KO>B1tj
zpYN_uzvxA8Y|=CJ<Nr>7PMaC+m7AM^F7Xh>64&8pJsM4fXl6DoL?z!vg1gy339XdU
z#yvbjIghf0c9!xOE7-_t9;ccl7Mpm8&7#sF>@8Axg3U>uVjEBMJkRhdTjkz&vR9BE
zo@I#VI3|@7yuc~pj9_z-7a8Rx#(0^3c!mGy;<9v(^P0-!brs+ZHGww?iskv~AB({R
tS-D@E#D<a$jPtwL%n<7{N5oMFnKH6N{5*+I#OCq`m&g+8n0E?)UIkqQ1H1qL

diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
index 5666d277d571..dc19af255168 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", 
-- 
2.47.2