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 6cd323902d9..efc15120966 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
zcmZ9KTTE0}6o$WzGsBs~(cm%QttKO+)eIhJ)ucvhQ$dUxz($)`6U{_nz)4!L3@BFZ
zD5>eiYC=xDp<=AI(`vm?@Gu}Et+pzy;<es-v9`4@KKRrZ6YM%OF(zhbubus`f3N@F
zd#}!%%{iI<gWbKrEBu>Inj)`x=9uQe;cbP-G_8!!4GwV79_D{B^Giiq{t6w%R|a2m
z$S(F*$G%bMxsj@x%5YU66w){<BzHaT;sQo$!b$vFg(<ugtzzXn4N-S$bO<lpSRbyd
z3FH*#XgCVBRwJSC<%Vl2BUOGz(QR;&7ZmC5hU-_<Rz}k~r5ImZS6yHq@Qtuv(~Vg@
zOwxIoK7;R=s?Z|Q@@4grRbh=YqA;&~Zpqtk&R_6Wz)uf982m_y!c!TJR_L6kKb;GT
zY<ob@_8R=e&vsld_FXclV!(c+2gY7e_yba;cxGv7K&OIhZtl8b+C;n6H%c7nc3H;A
z!e7LFq5DF&46?}9xFf)Njb9Z;>N<gfVDdeFS9n9AK(N5AcF*9?_I(+vhs1oi1Le!>
zpeVuYvfxSHSnO^x3o=6v`xBIQvcUYpVUfd<JcoE673J1BJZ+XkgJm9eSZ+;ngL%ZE
z+A@zl2P9c-$y9qXo=C<{H^w9>VqIN~Q%v{7DH`qRB3IEz&vfr-ZwI{zPPgETGtn}?
zcPqQ#*#zetE?Va06e99hE%Sy{bdNVGTAp;f?t*z%CpRrKrGERFZqn0ThuBl=zqvVw
zKiZ@*)6gXzA}Dbs8g;xxlnJt0yhlFuOs0V;tm0KxGlNEoSi>CNr<}DcWF3oH&r&{+
zmyQu(1GQ|F6HUVUP{t-cl40{Ptua1fKc5n3Gwpmv7hB}&Tcuq#ahYbW3+)cuxW{%L
zu!D!}<Pp30j}{)YTPgM^FMG)ltFNa%5`&?#lP?wFn6!q*AonSeYvprGj5IMsOf)5p
UWO+nj3V-o8UZMUY=hAraKNFSqsQ>@~

delta 975
zcmZ9Kdu$X{6vlsdyY0@-4ziBYfR$uzA&|Diii#m^f<jXhNm~dZsKI1Y+iAN|3U*tl
zR9GoKqV+{4Mkt`+p#>C6p-#80LJ<@M#0RKV@d3(96aO&&!C%!gvm_>FGUw)g=R4o|
z?!Bk0aG)@HVr=LjFq7Xy1QaD3=H9Yl?8d(GUTw-mwj1oALovRoHdRyGnp|mD+pSH@
z>vgJm%iwK#oWHcG(cOx`j3yn$I|lEv*O?Y>O!q4EqGUsJz1<K?BsBVj<gEuhT)<?r
z?c?t&OyOl|bt@igOL@P>fbi`0R=cG+R#;J}F{n@-8pDdbBD=Xh*$`$T9~vCwRz+x;
z?<*BzL~+~lmd3bqb7XQwm_wB6+|Ch$quiy?lGo3n@rmfquerbS!G#MJEslB2;|8Bn
zsR-8FsXCpLd=}!AvrI3@InC!zmtLWNY0$t|ih}9Rw#ZG+A9}dptRfr}or<|tRWY49
zzVSHUDrS3}BIk}se))G|z1+K=9}FgtukoV*YczgV7}>ML;>G@DoLA%~60zdAr}V4A
zZwJ;#R^_Dg$&(LtLy60_Zi0O!{mjd7Uv=>?_deupqVZ_LWoL$}0T!9NTpn<FSlD|;
zsH?G#Nr~msW|{A~JYto4!QAK4Xqo%}2l%XhKjr!{<B}HMkhhVfH2YwX$%?XI5A!Ak
z2PsmFaHuSIQf@zoGknxdUJuhP^J7oh1CM1m;qrxLp2;H8{%gw|6+y4OUD5r|kSASS
zVh!-UWoEmd^Sk?P)4r*n{&V_E*35-IncM)n#Ql^?TtSG((P$w`D>G;#F6%5(+|5eL
zSVcMQ+`|)8vYPpHu#hKN!Wx#cmRi!-JjJ7|6O~S3ub0fztV{DOFY+9(@I0G&LFT@T
z-GcP;62rXAVaXilRZa_M6o+%X#syyI3LE*8P5eza*Q9ccEh>ktD$E;d9B&d4%X6|1
xi@`YA$rFo#w2Vqr*cZiSK&($46-S-qNXt&~^9(@|yOT>?CReCeq%OeKe*s+t1H1qL

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