From 426147a1e8ca92e3c32168f50dc9a2d04825c42c Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Tue, 6 Feb 2007 09:44:53 +0000 Subject: [PATCH] re PR cp-tools/30706 (gjavah incompatible with sun javah and gcjh) 2007-02-05 Andrew Haley PR cp-tools/30706 * tools/gnu/classpath/tools/javah/JniIncludePrinter.java: (printClass): Replace '/' in filenames with '_'. * tools/gnu/classpath/tools/javah/JniStubPrinter.java (printClass): Likewise. From-SVN: r121641 --- libjava/classpath/ChangeLog | 8 ++++++++ .../tools/javah/JniIncludePrinter.class | Bin 4343 -> 4407 bytes .../tools/javah/JniStubPrinter.class | Bin 3407 -> 3478 bytes .../tools/javah/JniIncludePrinter.java | 4 +++- .../classpath/tools/javah/JniStubPrinter.java | 6 ++++-- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index f82f64ab993..6cd323902d9 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,11 @@ +2007-02-05 Andrew Haley + + PR cp-tools/30706 + * tools/gnu/classpath/tools/javah/JniIncludePrinter.java: + (printClass): Replace '/' in filenames with '_'. + * tools/gnu/classpath/tools/javah/JniStubPrinter.java + (printClass): Likewise. + 2007-02-05 Tom Tromey * java/net/Proxy.java (equals): Handle case where address==null. 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 5124ee9cbab434945b12681da057cacbd50142c4..6c29cc3c22b3e8e578d8dc32393b56a08f1c4bb8 100644 GIT binary patch delta 989 zcmZ9LYiv_x7{`Ba*RH2$2d&3AKqQteCS%*77?GGY5uurhWK4nvHIg*7J1f;$X4{Pc zVrAaqU2;Ouc?*d;@rHwW)@=&I8y5xdIstE7IXTap_y7E#|MP!u z7v_xAg%3`R?FO#qTo9k4Y4hUCH&0zM6g!|T(pkpq25&H^2`z`FvvVDGL-@Cf}YcWO{9l&qaS}`%SI4FTZ)k ztr3s8-{1hP3V(;4Pw9NYp&(y6tMpk_hxy7`ugCRo3_AH%F{{DZrq8%??n;gC6`_de z#22@J=00X$i~>470by#{*Ok(qNgNdCDHRuf#!@uPyVt3L@=) zu*^vj^ve4b1OJS9(v3~l2uCcl(*0Pud%10~Z0gtloc>-hb9_kdu@7D1PMRfl6XZTL za)c=`j~=2jUQ3>Z^wPpwV)U_yb+odcrEFk1_p_3X+{ptZDPr>=_pnJ+`i1?FWFBTy zkw7)+Cy9I+TE%2f#q`;^%9iS?@{#Zf<1(z0LtJc3`uuHjEk M6A1vJ*~9EGMx3SyYU2Vo3XZFh3j@YPS1vRZ8$(iKOo?R|T%$l)Ks;_G z8qX$Vs%=qAq82<=rPAfpTCJygs;64dt=7|(iM{fsQNP)}Fq+A{lX?I5f4}$t{;wzZ zWlqNVSN+F;@jUh6QWUgK8P@u0NLTSW&D8i_;Tk(%N6~4pmwk4~UmZW7(DR~IHQ`8A zprS(K2N5~n!wxTGv?h||yA-DAQnJdrg^e-i)i^4;NOMD^z9x_x%GLNup_Xa%D7<-* znsBtrPZoU!{ftof7DXE7*M?(0epckv)>jAZ-QExENxCs@fH6Ab_|@Pzg$gYiE1TC4 zZHj38CKYCsO)r`K$;?^h0Y3wrGB{0%!X1vpDs|3s&d2YHO#8B)=`lFZ1-nxZc`q4M z@rV6F4-CJe@CU>sG^MmOpi{{;XYIOT;wbw&Z1 zXxvp8spABK`N@9VS9mHa0{KD5?H_{&N88gEr}@)x;|1ljM-I-8_fp!!EOSqSPZP{7 zNYHVd$};OL?k+1qqh;<-@VPa{0rOyjYRf$I9+6ZXNiO}E#O@>}9F(uv6im{+gZ;pHpmojq?=7L zU7I<<78!*#T&0y8*xaRdD-YSmGrs0I-|!#b@{%_GXS;H-LwVUry5yXkx-kp}$)DVv o6pqUbWQh79C32=9wwf`_%vgjJi8FT+GwXe0)nIO*=w)+?>O@ORGSlY`d+DOrpHH`!2MhiA4GtN$ zyR@@I-!;}P?rDwJ zR3(xfHU))KU+B*khkA0g8y%7yb}6!4VGM|2*`{Ag8+x0APs<`S@s`UVCB551duqbhcvmscSd&p>RAxCg$MFfwX^d9SJP8f)1u+tAJi zcCeY9yiA9jcF{#AIf=dOrOZAmbaPA=@i+%Ki^n(zxhUH>Ne|Of`8$W0CC_zX%nR=p zef+~=7KwfHqaow+gk&;qp5u8GjZtoLnJseHwVY=KzfdJoef-LAgvB-^vRCBSP+S#S Hh(8_z6HU;U delta 833 zcmYL|$!`>A5XFDrFw@JpgRD`6Fc>c&kS#KdSPqs2Mu3E5#W;Y?X4dw&ZTH}fnf5|h z%$h(**glrvutQ?jgAr;BLdcwuxNw4dZd~~XfNDTOEme0_zgPA8b$u76znND2`s1?~ zz#1vI${;wLV2@`s{v1saAhXiF7&5GE(Y?6A`J8WR1?l6`ZEe@O6qVE}VjBO6v z*`ePV{>oN|8Dtfcs;bvpc#7mKzbD((-{w^;PEt*WLnmd5L|@+T2`q8~o!40xy(+b- zrQ4y0UVYRoFWp7KB(Ip9a|hf^f8cjz8vH`w5YVqD%sCZ<>^2!vq`m{{1269ey?KXU z*`p1sBEC;isaGW{%Wd{D>~MgC3d7B2y+T2u>XRJisL2tXv&tKO<9CJS7aHBb9}w~J zs`~1dhRdyZbzcQ=Hastrf=E z=ySC$vuE1pqsI%18eM7ssJADJb+`HZ6KeVULx+JLRF!{hw?gf*$AkaZ!O=7wyYpt>>riuhPM z#7(E#LfX@FAG0*Nr~Htel5{<#Pf;5mWphdVDFccL_SPm!5|7zG&Y=;EQI>t-N2O!q zoCrDdE&nOx+}G9@Lxy*zQhviur{Mt69hz7O|EZny90hm8=ughG_9h9ShhYrn_ib zxkQ$0wDBJv4+Q>5h|k6R34DrVWZhTWaQHzoF^~l^REdBw{$;ty%W#(2!k;8VbBuCF TtZo+(cey7gLUCVMF&=ydmmkA( diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java index f29bfc30050..5666d277d57 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java @@ -112,7 +112,9 @@ public class JniIncludePrinter if (! klass.hasNativeMethod()) return; String xname = JniHelper.mangle(klass.name); - JniPrintStream out = (JniPrintStream) getPrintStream(klass.name + ".h", klass); + JniPrintStream out + = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".h", + klass); if (out == null) return; out.println(); diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java index 4e7871008d7..758ec21c091 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java @@ -76,12 +76,14 @@ public class JniStubPrinter if (! klass.hasNativeMethod()) return; String xname = JniHelper.mangle(klass.name); - JniPrintStream out = (JniPrintStream) getPrintStream(klass.name + ".c", klass); + JniPrintStream out + = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".c", + klass); if (out == null) return; out.println(); out.print("#include <"); - out.print(klass.name); + out.print(klass.name.replace('/', '_')); out.println(".h>"); Iterator i = klass.methods.iterator();