From 596438ca819090ac83159b4d068b78c17019c066 Mon Sep 17 00:00:00 2001
From: Stepan Kasal <skasal@redhat.com>
Date: Mon, 26 Mar 2007 22:15:14 +0000
Subject: [PATCH] Main.java (cniOrJniSeen): New field.

2007-03-26  Stepan Kasal  <skasal@redhat.com>

	* tools/gnu/classpath/tools/javah/Main.java (cniOrJniSeen): New
	field.
	(getParser): Use new field.

From-SVN: r123240
---
 libjava/classpath/ChangeLog                   |   6 ++++++
 .../gnu/classpath/tools/javah/Main$1.class    | Bin 1002 -> 1002 bytes
 .../gnu/classpath/tools/javah/Main$10.class   | Bin 928 -> 928 bytes
 .../gnu/classpath/tools/javah/Main$2.class    | Bin 1106 -> 1106 bytes
 .../gnu/classpath/tools/javah/Main$3.class    | Bin 1111 -> 1111 bytes
 .../gnu/classpath/tools/javah/Main$4.class    | Bin 994 -> 994 bytes
 .../gnu/classpath/tools/javah/Main$5.class    | Bin 1056 -> 1056 bytes
 .../gnu/classpath/tools/javah/Main$6.class    | Bin 926 -> 926 bytes
 .../gnu/classpath/tools/javah/Main$7.class    | Bin 1004 -> 1051 bytes
 .../gnu/classpath/tools/javah/Main$8.class    | Bin 924 -> 1051 bytes
 .../gnu/classpath/tools/javah/Main$9.class    | Bin 960 -> 960 bytes
 .../gnu/classpath/tools/javah/Main.class      | Bin 10939 -> 10962 bytes
 .../tools/gnu/classpath/tools/javah/Main.java |   9 ++++++++-
 13 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 330fe70fc57..54f71df517e 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-26  Stepan Kasal  <skasal@redhat.com>
+
+	* tools/gnu/classpath/tools/javah/Main.java (cniOrJniSeen): New
+	field.
+	(getParser): Use new field.
+
 2007-03-17  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* resource/com/sun/tools/javac/messages.properties
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class
index 5937740302190b73ab7d6d4d09a4136d21e6666b..9acfd81d5b383f7bafbf1bc9970c743f3ef76365 100644
GIT binary patch
delta 31
ncmaFG{)&Br8#Cjo$?nWyyz3a)88$EoGi+oKW!OA<6|(~XpmGT~

delta 31
ncmaFG{)&Br8#Ckb$?nWyysH`58P+lgGpu6}W!Nxz6|(~XpQ#Bc

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class
index ed0500f45edc859cf35c24bf56ab21697d31e144..7feb9340ae7c401f119b96e3823bf8d8959a0a7a 100644
GIT binary patch
delta 23
fcmZ3$zJPthA0|eD$$y#RSVb5(7)2*1FgpMMTI&XD

delta 23
fcmZ3$zJPthA0|f5$$y#RSa}&Z82KhAFgpMMS|A2i

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class
index 1eb1b1e43232c12adacec646aa7ca31a32e0c2e4..81488678dd791431dced813acf55a04083c489ad 100644
GIT binary patch
delta 39
vcmcb_afxF?4m0DC$+^rEL{BhqF`Q%&VK~Jg$8efKgW(K=0mIqJLM#pd|BwrP

delta 39
vcmcb_afxF?4m0Dy$+^rEM2|9XF&twMVK~kp$8dr{gW)8D0mG@uLM#pd{v``&

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class
index a798489e93c781ab7764a03a8e44f0c9b7b7649e..00fd9496221cbe4539020174b66c0d7cc3a3339b 100644
GIT binary patch
delta 39
vcmcc4ah+pBAv5Fo$wkZ)M6WV%F<fI1VYtp9$8du|gW)EF0mH4y;w%mT2uus_

delta 39
vcmcc4ah+pBAv5Ed$wkZ)L@zOLF<fR4VYtE|$8eQFgW(#30mJpl;w%mT2H^|Z

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class
index 0811703a1e5fff66325b777e0bf38b745c78b186..818c3d46e4f59f0a15cf551deed7ff787929d831 100644
GIT binary patch
delta 23
fcmaFF{)l~p2{YrJ$)?O1tPdDC7#>bu#Owe7W^xD+

delta 23
fcmaFF{)l~p2{Yr($)?O1talkW817A8#Owe7W*Z0x

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class
index faa51e20a530dbe15938b3e0b871f79d39ee01ed..d0b741f7d70d998fd2ea05660dc9b17ca4a48195 100644
GIT binary patch
delta 31
ncmZ3$v4CSk7&GJJ$>Gd3ye}EJ7+x`mFuZ1vVR$q70kZ=Dr9=u&

delta 31
ncmZ3$v4CSk7&GI8$>Gd3yw4c87@jkTFuY)pVR$+D0kZ=Dq<acK

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class
index 10286fa7a07aa1d5dfcb92bd5300d469375ca702..4e1c7f3e538bfb8c14bd9ea00f5d0ca4e3c6511a 100644
GIT binary patch
delta 23
fcmbQoK97CFFDAx!lYcYCv3_FUVE8;aj@bbKb8iUx

delta 23
fcmbQoK97CFFDAy<lYcYCvA$>EVE8aOj@bbKa~KHm

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class
index 6da557c37ac7a0fc8b623fa80027361686cacb64..104ce2ef951a0cb081043016b445034acf2552cb 100644
GIT binary patch
delta 243
zcmXAjy-osA5QV>cF9swSffxya5K!b-7VT{84GjgAwy?!ETVQQ`hRv-uJOm+ukYJ*{
z&tgj<0y>M$nK^UL%$%?IB$58yuik-MZsKS~IS5KK=T}uzL*MI<d%ibtU0<P|jwy1H
z;*zq$h?wBY-s!fg+mU`S4qZFdFKTT&=Kl2=gO;n^)|}*=LP+kvtAw1qk$=oqm()I@
zS!_Wes%AlDCM%j#!E=rTzd2(=i63fgaoCYQXou5e$O@AuG{h&NXbRJ`$hW0Q%1A}J
L*scX*lE3o@#}O+G

delta 196
zcmbQu@rGUC)W2Q(7#J7~8Fbkhm>3xpCQg*wsP~_dn>jfzlaYZjii1IEav+m7qsru3
zCJ$z92A#<#m}(h6O?G3pt&e43W?%wpmetzAz_o=zdL{$!ZU)InA;s+s%KJfL%v%|x
zHv$zfG4KOPAqEy8`Hg{#;X8u}!w&`-hMx=qKoK#BAq;{*6(AtXpbC^{1RAae<S{X*
ZGiU&5E}#e_NE)b06G*Z!Fv~D#0RT)%ANT+O

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class
index 16fe8a3a6e5e1cd253dc78509e5c98f75eca6276..8b47b8cfc34dc6ccb7ee0dd7d7f8833efe41661b 100644
GIT binary patch
delta 286
zcmXYsyG{aO5QV?_7hEK3L_#DR4Ea$+MFA}=t?X<pjD>by)?|(Tn?NjxF+KyK^70ZS
z7!ysj_l<1C0c~dHoHLg*&;C;;_x1Dk0c^49V+7mll?Tm{90q4D-f!=@_#ld$Aji`z
zuo$p}6+9I)EDP1dU3G2ZBAZ;;#-)pG(zXp%?e$65o<{bj6P;%XSqbnd_P5Qh*QC|I
zHFq-Vf192A4jx7gwCY2$LrM=6|EkI(Gw*~)`RXgR&oP&Jq4b|C106BUYMdtx;!%(k
tWl2+$DVpMwn`o2O%#l~5M_8qR`e#j%p-#B2MOG;p>)N)VF{Q6IegSbyGFkut

delta 158
zcmbQuF^65?)W2Q(7#J7~88q1$m>3xpCQg*wsP~_dgE=`blaYZjYH|~kGqXB_#^e)B
zwT!<fyD{6QIWjN-Ap--a))odXmaPoZ8-W}q27VyP1(x{Fz`@ACAOPfxK@>6wG6(^A
pKrIZ43?dAS49pBlKpqo=GJ^_`<^qZUH2{GSgDQ|@VUS@^0|1DF6-EF6

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class
index f4393f56fda36d81525601da85e1733c62b1db80..038d74d0fdc73cc3e9ef0bb7f9d4010f9465ba4a 100644
GIT binary patch
delta 23
ecmX@Wet><05Hlm^WMSqER$c}UM!v}n%nkrVH3aSe

delta 23
ecmX@Wet><05HlmwWMSqERyGC>M)t`K%nkrUY6RH;

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class
index 56c7f488a24fb8b749a30b936a64299e3df668f0..ac3fda855420595e9998f3ffdd0fe95f62621288 100644
GIT binary patch
literal 10962
zcmb_id3+S*`G20xCNr5#NZ1fyp~7$#vgF`U)D2cKfCNK=prny%S+bL`u-T1!AZRUW
zy=o7yUO}rCkEr!PtGi%4@Tj!f*4o-jd)mA9wDs549`yUXGkb(A;2%FfxbMt+JlFf&
zlNbN{_)|o*(DNRRJWSL2W9gROXegN+45hZTq~h^tvSn*%duU6`nouOBk(a4f-dm!f
zSbs~`=B;*bim5VxglT@qkzuR_(5}H$Bpy2>5l;`c;$%FX8ce5_M-oiFjsoQMsYE2!
zj}2AWurd<0J3|9DQ$;i$3ftK0clO5YRLeQ*I@*Nd4z+|MW+)m3Ku{J>>}1lm+lkHb
zBu?|WOy$W`dUKMgtTz_HR{VA)R>vaiZ99g=zIdV+8+FCcn$RFqor5TyibPvhg_2t^
z2^3n&-jP!46-y(rNa}q6IIm#?leaA%whbzyDJD&%NgBO}so`A<#Gt7(rIMJYn^aB}
z8qHuDuY^*J-yqA`HQS^*njrh%Yf?Q;V5;ee#O%)Wz-Bvfc4%`HtoS<Oy`kuaP$DAl
z?xZ)hB?1{(N4YAwZZKMtutVXt_`pCY7M5#Zs-HLZnuK#>#g1NE-EC5%7N$TcuKVp&
zd@$AG=s^B}MhlrHDLy0d7D3Y<gHk{T?9hNg3uv(jvr(fHa@&;lIXZHBIueCS=yW2~
zqYr1TnFbwCi{&S1QY$URd}wgcj)j?;N)bPX9~We+PPo^qnN}>GvijobSXf}5X3{b`
z9XgVVI|MLInAb1{Myo;1v{<7ROcQgQou2ONvlDiB9b{@JG&%!%oLej6*jYAcCAACR
ztC=RdWJ5Yd`&t_|7_^)^WYZdGYGIQD!Cmh%X{{m{(hQ4!7_^Sg)@c1GQ+9YU=^WYW
zh4n%3>!{nL_fwD9ogM2>ZBbg@E(;q?`T(7Wh2AZp#4@-5@4WVgHd*<gNt-AH6N$va
z_KvPTXGtCEH7QI`p~@soP#HLcGq1h9r1aKNzibE2dVn4)U!AtXV3nZ?+Nenb1QV{X
zFGz=?Q0`HB>Nu*_hI7Ss22Hwv;6uuwV@xL%tAx9+2wU#t*eQ*0x~^cI%Myvu&W=bj
zWl)l)=yW06ODt|F3azA_(h1I}EEEpw1kL&oBs7??MJ;vuFzD_}MAY-8kV!fQ?-lQl
zMJ}?#R<C1yK}(~{kLsb%hEFo+GP*((;z}jjBC4GWRyvWSt4-QTaOWRoIxeSy%FD)6
zD@D<ZO!H$oCPn$W@(W;2e4sj{Tyt5UxD?kfk2PcXk_u5kao&?1vao5iMTqb2O(zm|
zEY&6+ovGS=-4KeVZMjtEr1FM&dE=Nj3cZFpD4m0&Z-=CN2Vn5!+vTKq^ntJf0+`9(
zP^>6E%r4lCaMN0ZLLB~jI|ZR>^m+KpQZ7xz=S0WZ3k|x3ZWHO>&a`CSvAk<ZL<a4l
zJ2kokqA0!?lkTFsVL4Igmrw~=%o$BLW>a>ewPB+J*1Z9^p?l~)jqc4EdqH$blfFpz
z<61&V(OLoMo-K;)t*+&%W3sJPqX*&f3TodLk46z{5z`IYOOI&u@R*nd5t{TRdQ@<Q
z!^@&k=!r|bf?EIq3&qWaB^wwwnh%&u!cL~6DR6#xOqMH>;O)qz<}eB1B*Kp54>~=G
zZR)}xN=&W|C6c0$bKt;B-K`t0oNeIz8K&k^`@}@!u@<GYk~p1>yvaFaAUHo~(g>Yy
z&;k0g=*A0TnGSPBVXXDsh7CG>1))Ek4E5VVOOa`9>{@$vdspZB^Q^XxW$V{BH#ZBM
z7fpJJ8pV;?sa49TWcKS~)Zah`R$B8$#a<`>621QBvGsb9PT#_vL(G<wu35MtC%w|?
zRb1He_H_omOy3puzQ?qxGy#eul}EO=jpcvrjD)uX^aJ7QHKaJDfsW!z8R`#@&Cp_<
ze$2F}h#}D(YhFAS-D$;RwiWNQn!;8*VKv3AfzVECvu&l5cDO;OpTgO!Z0}fM(ChSF
zjedS?WXJ3DOXwgRkRZ|N*RT%>&^gC$$+SUl&~HV2zhmkt&1sSN#>(p5%*bv3{@C=M
zpwk~EP(`CU{TX>&*PxvUr67}-g*i8#DO<A;DeOc+84P-peyh=6kBwuAPBl9HA40*3
zfk?`doZN~G3`Xq%`2LXNOx~h@h(P|ybjJUSK!p8&9h<Zhb@~t3-x`bPbckuDB5-wQ
zyCO0vI<ZAroHZ|O_l4k)8Vq`e{-Lqw*sxF1saEH5D6@jvb`+=<P&OFM0$D#c<db!(
z*0~B^UX<Fcc&q^_Mp)x&2$ILW8^au{M<q-ZlH^*Z8KqodK}%;ZT%eOr=Q{Y;E>-0z
zO;1|ME%9_T3}w17v@<EDbzvfsO4%`kYv>;;O%OlNw4kI<KC-Vx45%9jZL=L@MG?L>
zm!Ic?B1$Gkfu@nJGYT|@Q{6+0QNuXyZ6yp60jK~=CgjWvlPXEaW}ap8Y@P#R?Hve;
zh)F2_kX-KJxhBt33z4Lp(m4S5b9IKdu9<5^lB$>pxi)_-Ef%mXCi!TbJS{Y-8c)2K
zPtf@IT+DXD#Li^O9x!<cqtGd{69`*wHUzHLqFQ$ArB<C!2Fi^(LmmN0S+cI3mP2Q=
zWu23>ttM6HTB*1dhpLG9?eh#ig-_KO6_1nCj)rRTX%cXdvI0>Qp?(jaZgQLAG;Bxh
z6gXYMG`l;LgjbMKQ=mI54sMk5itC_-)JCCnA{S(La&a<{E3!*ozN1}=Tgi10AS`Y-
zc{QJj6c4T=u@mYK|C+mSm0n<~wTjnpm&Tn){{%)$Zo%ZWd=}0^0&sG12zBD9v+eFY
z0IcV8G(H;@bpb$b)#MG_jld8?MtpcV=oSzfql_x57SKGHy+R1C;`j4LlRqE;DiF=i
zwAIx4CVx<-bWEwlRpSu+#*s}<B_G`hsdN)M_aZsiC{h-&qikgxr7)uy8&v_9C~llG
zAzuMA>MyT_OVxQRv<g}h<(S3;N40+UeoT%tIw*$H88@NNU3Jb9k8;b!4B@Kf0um-C
zMdh?Dp=76$wYE(P1xbe;)s$>*)=_}wR0q7E{WHOFcS;#@cL}RuSbuS)k-saf=@R*3
zs^TeExS5U?oklT%I~j~8ovc$7tvKDzmuJXO1w1&aE3ppKPo!af%&797qNfeMim%c5
z>Lc8Tn;kj1sL3DYYXN>xvR;r~5`PJtg6-obf0%cnKgFLk`8vMd$)BB;8`IRB&6McJ
ziCeqTB!j91&ZkVC#FOReGbT^x$+G%6lWHCJx7(x|8mI9spzg?;F6}xb4DMALd^6uF
z@$ELI#Yeje)zNY;Jg0r<BI(xn3rLxdimg4?8%>ApJi^=gR*mmGDvfQ2(Rha(89pi^
z9621(-F&MQRnijVFPdaZ>|uVuq}_D0&JV$1H1~@BqXEJXoBRlWNx8vrvO6Npno%u~
zoPr@r?WL>n!(BRO5#}~ZfXI1g_zLFzCO^(2j_+~pHrFM|Nv?Fg<hbWiI$z0~_(_wW
zA|x?hQEZ|0fXUDBv#?n-K%${uDC5L=ZEdBRJp4T3W}ZUDtRnFRA@Ly7(h`-_yQWQe
z{i?|;`3%q&O7z3##9@{8AEQhOj=)gFNLh(vRgq*-zTrhQfrl*aXS<#jW|KdL=nj}l
zSkk$1YVd}V{1hTiq3I!^?>i=cm%j&}06?ljQX5N@@5NJ~L2g_jW;)eHh>IQ7T0Dvm
zRVUp@)2i|7=pn@u{Vj3zG2lXbb4w^W;MBrW=GX~?U!!&ddhla0)1N@V$23z!c7Bb2
zX7U@13acX2E3IXu7xOxffN4V{8A14#D%#**@~<`iRW96)=FH^Z&?Gp)-l+N{;E|?P
zA&)8+0h9s3WcraXI=rF3vVi|6eEmt%j?wN#@)PF2nEZYIfn3*LP5ztoD64wosB$8)
zBx1eBsDfq|?yVi&l>Sh3S)xBJwNSp_rn98RN_h~A-+@)+Q#<udBy8~8lESL^Bw8tU
z_Ft0^dC-B-R2NKov8bX8xQ-b9TMduL<JCN6xqkatzixWUJr&60`p|M)XD8!n_2Fb@
zG5DOvaWJ|dT6GUR!9=v+=Ax;N!$k$9rF#rXHzG01@R*))nx{I~26IoFo*EA-4<nAg
zDZu0N04U4_pV1dBu^JsCm$0&QBAV|h<wyap0bBzviKgJkGs)!3c^B>-P>uEKq~!20
z7>OOtA~?{~9*fxtWdnASX5efYKA@TSA75<nOHx*-5v76}5&F~!_pL@`_-aI`QzL?(
z8ppdMY610*Z#!zlmmQ2Xz=SVK_??WmO~A?+-y6u1KQKa5d$M%gV>Atq79M9lMzac!
za~{S{56#8zL{LezjJ&i05PN9~_0b%>&%><gK%@o=;EiZLHR4ngp1fFT7QCJjoCi1D
zK0*t6=4WZqnqivJJwnYrBXoR^Z%LL;nxCPQeW&0jL#Jk`?dcI(j>VNdjagcir87G@
z=;dH}Q-(T&6~m-;57Qs~6$c5=zw}pR=&WFc3>$_H{ls5UmZ5WNXWfp)L$CNNYOM^N
zzeK}yy_TWPLET?buX#6Rs4rOQi}>{nZ5yK5e(wuZ6L^&7_`Uw}48^<sl|k<aB_Wn{
zuzdK?HGc0wsuq%c+l4;g4)<hb*%D)zI(!%9-o5g^)OT_2y+Ym_eV63k%jNw&dFFS4
zd0EOa?k^vq%X;b!e`S_FlA)`*hYy)!h<g|!CRCLsT|=kICm*`jy{cQ)g$-aOj-v1a
zTuPFHl%i88jhz=`=Owh7cF`KN{MXUt_;T|Re3Q8XyRW1KU4<Q2<LMf@9uRla$LTiu
zBpSZg(?fIv?V}sfll&CgYoDeU=`-{yeU@IM&(SYvh<=CNf1{hx)VPJcXnPxU8_z;V
z`*_;UC!+3KN_X-qx?8Et{WM;bA*V8U`Z$yv1_Sl{1n_w%z|-BQAj<pefWM4RVG}gy
zP^;6p5|rEorCN#kPhqYC{QTN|x|sHZzR$p*t_0Pe#j1|;cY;nG7`}%SLs&JiKlk+a
z+!Jg0r&*xU*+-H$fjTjuByf5$PM<$QxAX*{oVRA^3!P2SoyMkpG<<*_$k0RG1<UcN
z?f1bpGpN?HGz~%&s|h$@aw4GV^cZ%CZBECoeGtJo5U`&f2SHwG1iJ(@VU%5Ez9;r#
zaLltpO+8U$j%6-juVnkqQ9c0@5v_T0gbwrsGW4uBOV4-A_Z`g8SLZ|Xr)B7CVC&_c
zKyBFfitpQ5`c8(vkD1po6Zied_meFB%$a$kC*b>q?^iPO8)xQC%>2RkCpq;OXXY);
z{LS}vmj3R%zk~OG`~HjEQN1(w1nRh~j=foi;Q|k9GE-T*y^f76o6cN~%#E*OUzR7x
zOo8dukSEbIQ1WN-J^ML)1AiV~=Vdy9zDXz2E3_2Pr_vAUEc!WZgo<v$*h_!J6}}CX
zKSZB~65Y$SG{TdV;3hi4aRpb6Ot+pVLUbM}J+PMZXxA!57{I-VFlPlGW&c4MKSFzY
z>Ue6FkLwtw8hMiic`YJYDFYuz8c(Bow(y;PhC*!t7(ltGeN={ZQHB{n?mT&<>KQ}C
zf1r&*#0@S!OX17#%puw}Kf~|cO>;)*TIFNwxB-3!G+FR8bu8Xi94$9Jjk)IC)QDlh
z5Y2jo7l})*<CBWF2c7L1Udnp`c-d~6UI4tju+s%u#Pa(PFNmAS<Yubl1vG^h;?w#f
zYJ+1~4V65fmry^(t#A@iKADmnq|3OKK8Eo+KBeepZg9n8;v;3f5|2l6@G(L;1bfjS
zlr#ukwVykfI)^FLw4c{89pLxlU(oCK?w7ynI6!-X<?@VA(g%1`u)+~SV_pcG!5YE}
zhwHc>B0yk}$4Fipjs9|3-UjFwFzr5cOTq91@G!(}WbksT=9MUc&!D;RfQ#Yng1nk~
z`Aph|wG^*WOs;Z>c9{hEoI(H>Q%`f6w}VXs`!D1j(3PpQmUr?+V011m=ZhhXa#~C$
z@rU>lctWq#+&C%z>ID2R8o~v_l(XP<MUutenz*r>`BJ_NN4=8K94^_i^#G0>gI@|{
z_#<l?A>S)I15FwJSU`CX{={Q^gJ{@6(!9guEnDKP_YRQ}$ns5y*cd(yX_p@)@59*j
z+1+$JhM^&vJi<5k1pMXoUc5JF`STLsSB~)Q#gltva$)|!9mQ*R$y)sg-(5U;Pq1Qy
z_V#4?-k^qK_q{+9klHA-ybosL*D`#6*%BQ<o9gvNb^Kt4_YTn{zb2bx3Y#+gDDsSI
zzb5bUa)r+Idec*1IP?uU|5#9W^QK_sFx}<Xm5v1szwr$18KUJt3zM3W*QShUlW~{|
z1^fooFw6UbRf5@H^(a39)IoEY+GS~7ZF6l)hMx{r9}ez00ap!OEY?T`qgnw7V3EHZ
ztnyd-O@Eb2X+WXU)9wH!E3*8Rf?C`SB_Q5F<=jnZE>bP`Kxa2n1AhQ5!1EAu&!=S^
zqE*~WT^yz`_u(%Sw$i1%4X$*6hB*nBnW8MG@jY?}z9?Qquk(lKPkbpp#_ZrSzJd+D
z5`F!vcp@4~)A<uT7agHyz5zCRBbt^sp=<a#-p)gO3GYUG=JSk320zHR^FEw;mha#f
z`A(&_FG_05FXhyhU&4y0Z8^Vy=dVF=tM~wa9dn3-yobL5we^CF>y<Yxrw}}>*i;2=
z&p+Lme;P)Q-dWwtQ^C<bSmsNxt_zVh=*VlHQC5gA6j;fEl1k(%L;Ny-6Sm$><CPUw
z@q>61d#qv`ki|w#zMFjR({{jn1^GxdD!p&<w_R&(1Lb0^Di4Kuy?TI>_*aN|j_ux4
zWV<yvAyAEUO903tb>rc-D~v(}MAJt2HDuuY!!;wksRuUsqt3=AZ-##gbiZgSU{V=B
zKLF+)1kn%CWZsKEN_$vgc5;_#dCb%JxBNR`u0&9KlYbA~J}_Gk<`E;MCp3ndN8B{3
z)2Rpe4{MN0@t-^4M`ks_05bg65Mmd<?Z&RZL)F#1DEmJh_nYN^A$B?YQ5M9zi>RLo
zNf2j1eHL=rN5}DgTEve-1@_aapr?bKWXa*AGtWsU|64_tO8fzq@Z>@CI@RTbrFC>T
zCtL<jq<-5aq(Fvm?WS!KK<B$=yN~|^+Qq%7fV&1pd_!Z#!<|hBsUaUjJsLJOiYa?4
z@hh9)CfsP+l<`yry#YTGr9TJD6&|NTaZ$c{fHxH`u2~gY&p_{<L%ew&eTFZikN*O#
z1o0a%p37gMP5f2-h181(wqH{h`aXw+ycl-5sx+56JmVos5B`|0&Exab;X*edjEiWz
zv;{cilFO;mGhuAFK$YQW^SBY>o~)<7V}2mxnON{R;{c7s3iw-ykl!v+>T$}R379K9
zlM$Mr)E+;C?D0(TOvShkvG5j*1Vww<9bb3HH{9_}cYMno-*HBkh>CN_^qmpu3I6l_
E4}wiIoB#j-

literal 10939
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

diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
index dfa04c4c9ef..29c96cf5bba 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
@@ -89,6 +89,9 @@ public class Main
   // True if we're emitting CNI code.
   boolean cni;
 
+  // True if we've seen -cni or -jni.
+  boolean cniOrJniSeen;
+
   // True if output files should always be written.
   boolean force;
 
@@ -243,8 +246,9 @@ public class Main
     {
       public void parsed(String arg0) throws OptionException
       {
-        if (cni)
+        if (cniOrJniSeen && cni)
           throw new OptionException("only one of -jni or -cni may be used");
+	cniOrJniSeen = true;
         cni = false;
       }
     });
@@ -252,6 +256,9 @@ public class Main
     {
       public void parsed(String arg0) throws OptionException
       {
+        if (cniOrJniSeen && ! cni)
+          throw new OptionException("only one of -jni or -cni may be used");
+	cniOrJniSeen = true;
         cni = true;
       }
     });