From 94acb3c1a0fbd14482224d6af3699ddb9e163510 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sun, 12 Feb 2012 14:11:48 -0800 Subject: [PATCH] zlib 1.2.6.1 --- ChangeLog | 15 +++++++++++++-- crc32.c | 2 +- gzread.c | 2 +- inflate.c | 2 +- zconf.h | 2 +- zconf.h.cmakein | 2 +- zconf.h.in | 2 +- zlib.3 | 2 +- zlib.3.pdf | Bin 8729 -> 8730 bytes zlib.h | 4 ++-- zutil.c | 2 +- zutil.h | 4 ++-- 12 files changed, 25 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bc4abe..42be01f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,19 @@ ChangeLog file for zlib -Changes in 1.2.6.1 (xx Jan 2012) -- +Changes in 1.2.6.1 (12 Feb 2012) +- Avoid the use of the Objective-C reserved name "id" +- Include io.h in gzguts.h for Microsoft compilers +- Fix problem with ./configure --prefix and gzgetc macro +- Include gz_header definition when compiling zlib solo +- Put gzflags() functionality back in zutil.c +- Avoid library header include in crc32.c for Z_SOLO +- Use name in GCC_CLASSIC as C compiler for coverage testing, if set +- Minor cleanup in contrib/minizip/zip.c [Vollant] +- Update make_vms.com [Zinser] +- Remove unnecessary gzgetc_ function +- Use optimized byte swap operations for Microsoft and GNU [Snyder] +- Fix minor typo in zlib.h comments [Rzesniowiecki] Changes in 1.2.6 (29 Jan 2012) - Update the Pascal interface in contrib/pascal diff --git a/crc32.c b/crc32.c index 95225ef..5cfc8ff 100644 --- a/crc32.c +++ b/crc32.c @@ -1,5 +1,5 @@ /* crc32.c -- compute the CRC-32 of a data stream - * Copyright (C) 1995-2006, 2010, 2011 Mark Adler + * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h * * Thanks to Rodney Brown for his contribution of faster diff --git a/gzread.c b/gzread.c index e257867..bac5d22 100644 --- a/gzread.c +++ b/gzread.c @@ -1,5 +1,5 @@ /* gzread.c -- zlib functions for reading gzip files - * Copyright (C) 2004, 2005, 2010, 2011 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/inflate.c b/inflate.c index 70cd7d9..47418a1 100644 --- a/inflate.c +++ b/inflate.c @@ -1,5 +1,5 @@ /* inflate.c -- zlib decompression - * Copyright (C) 1995-2011 Mark Adler + * Copyright (C) 1995-2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/zconf.h b/zconf.h index 7c7e798..7f705df 100644 --- a/zconf.h +++ b/zconf.h @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2011 Jean-loup Gailly. + * Copyright (C) 1995-2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/zconf.h.cmakein b/zconf.h.cmakein index c299fb1..9510eab 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2011 Jean-loup Gailly. + * Copyright (C) 1995-2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/zconf.h.in b/zconf.h.in index 7c7e798..7f705df 100644 --- a/zconf.h.in +++ b/zconf.h.in @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2011 Jean-loup Gailly. + * Copyright (C) 1995-2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/zlib.3 b/zlib.3 index 4dd6f49..a0bd902 100644 --- a/zlib.3 +++ b/zlib.3 @@ -1,4 +1,4 @@ -.TH ZLIB 3 "xx Jan 2012" +.TH ZLIB 3 "12 Feb 2012" .SH NAME zlib \- compression/decompression library .SH SYNOPSIS diff --git a/zlib.3.pdf b/zlib.3.pdf index 653b67bccd028cab3280b0ba50fb9ac8aa02723f..d92cef055a6cec9c52b7656df958877480bf7934 100644 GIT binary patch delta 6208 zcma)*byU<_xW7SqBqXF`L^_9I7`j7ZXplyb5CQ3w_yQ7wN(~4MjRMl$-60@7q;z+P zNZ#}Nt-IE}_nf=dJ^Qb{pY_?#`@VavouYtJh*bgH7T{z7XoF?mG%k{GjH91P9JRnlk~wN>%3Z(cS7qnAXFY%c7Y|rqXhbT$0j5zH`42)_7K<_KA;XZ}>xa zHnf5MQbxY!7v^m@E4>e$D2MK9>aU0%K=GH26rdr=W-YD9KTYp$UY?{srOV_Gvo>(B zldEia4-p=i7^g#z0?M8GmWvT)l6C&TwqtU8kiraqvRhPeZr+UV>Fq^pO zUqd%#QMqqhywUL@1IUEuxeF1uohL@#&wlvdg4GYOY~mc8U!Wb$E)?qwquyT!lKD(I z1@Q*zi~oq>^6$WrfTjQX^MT~Y&o+PWU#ADDReddU^y$-E(DJ#Wt`T!e&X~T4>8F^0 z`ALsx()-Zs&ZM=mdZyh8eaY{$0ka8<5Au%{sr`J1z5LSP$1P^_Nsj3xqT*4QVol1r z846oop%VjnqiTrgWrOJ%=5D&p;IaPsgc%1jCC`se+ktLJxq(Mx-C!Su zlLDEe_VvEb%L4Drw(_HSjt1TPNQ2k4A#ZhEL_zJoZ+}bV!)K}JKL2(!aWcuZm-*R# zDzd7LN?w!REFHjN$FEd~EZD2YkW$BF_;6VKGx|3#Chth%KsQhnK1_L%UNk{{ zP8oE8pmmp)Q;mwbHpAU=Ym4rJ&Yn`YG$2$Hs7dG1-=`*1>x`&3ji(j%#ai9F|OFp^q z29aU37p(0o_tFwHny&!Q(!GDPa;JI$ZI&*vP3V$~{Pj*@&Oah~EFW>i4ck9-zrQhS z;I@nvTA!?m)b`?vynIP>O%M+~F^7wFo(3a~)?1?O6Eb)vZTl*ik;VBuWcyBb0#$w8i}r{dc#udRGso zw+BAGV$pGtWo8u}fIYlokkE`X`pFw)V^1T==MLtbRl$1~9gOyfHtd>BRB1Zmd!PlA zzA|RWkQoBiD@`4k>w#>^Pk(Qq>oyZ>Q(uW?Rh#!(_kLg^&M5yMd2)UIuW3NPuxsWv6w|sIj!Gt&PF;Y zsejyvJ_0m@iXWti;UUwL@OTanz#)7c^^9FR$%@Oub)DUv`RF+rB+`qE5M-x?_d^hs zj34e=!bgzm^`gv3H+o31(4HE1A%-aRSSpFHM~PMw(X|JX_nj1UvEDK|3{rrOIXez+ zUWi}f}phB#(JPO zHyCL6sS%7_%~z{){1V&Hs+Bs9TFvUA^=;$@FVc;Tfmb;XBnVT4pJx1s zeHYJhk^}RzuPB?pZnz-5ViOpq*5e#}s0wT~7pM~TSox6qldG>pT=Uq3AgD&Lm#u#@ zs)v82^pAEY6*&tnYS_b|+R{>Y_Dsd}n~ZX4g=!>%vLee(G&eIzAQPA?{zuP6=0(VR zvgGgK29VGYmW$jlwUN}5pEZ^1~~6; zo&+wrT-w)U7!dW$^PX7iK8~=pCO58$ujb82z5( zzNLmYZ6E2mXz;A$+jlF|rMDLIC5xY72VNK4x5`MJ);6^nNm%yHlJ{}wEk#i#iWl;UH+ZQVg{A=)PER}> zcFkHl@_z83LCjFYeT2xMI)M{hjrW-OLq?UAqEkJC_(Z16NhLSjJv$z_3MWWhs#h4t zM7sG<$2`_xdf+3yn_aFaB{(a&U1(Q_agxll{_z?9WIoin_o=3kOT;#DCpqUrk|=S< zr?ThwEa(#RRx?zf@1KXA>NZ%>d zD$lAS+o|sEU3Mw@K3f^6%gJT7s78v~b2ANs{@^uI5&`0S(^;4>Bk>XGPaA^RHYO9xtT zz0rwiHV&;qKQr+!Lu=v((3=7;JxeI5R5d|(*6^R7gR2QHea-%WpyM8vze!Z6@uIZ( zrvP!vOx3;C!UAmxVosNSy(?UY@SH%gq~@<-G{3#!%=fztVO(6yjQvx{V~Lul~N*#<2+AMjOS%Q7X_^QSvf zeQTeYZ6+o<7vFx8;~{kh&TAYl+JyLEJEkz;{z$oLyMT2tUH{w})SS;8YCsE)ktYH8 zH!#m5(HB6oMN*k`v*dPMtLKR~{pKpiPCQ(oRRS^zdOlQGXMcil)YC_!nvpuqJl8J2$|rAa;;36J_BP%o!O^@g$pK{Okx( zNTBwy?ScF)(^3<{e5PWs=J%SQMelXI@*<W+QOG)a*^`Bg37lD73zmF5@I!dAW${f+bZdlOM#RZ-d- z`WdZDyiK(?^KMFAK~6&qP=Rb7T9ym#4dVCTC?4fr_@E+PJXe@7K{zZm7Pvv zMB!S?e$KMK@I&E7Q=u@ozm0AA3eQJ4Mei&AI-@z9H5qXzYtc7AC=@%l(IL_J%8R!3 zfTwZjT3SFKs`>82m|R>Oc%7NlYZKbkG7_3jQ`>t4Cv@jwfjlij03ztDIjX^5 z%6Au@dH-Nb*xVhtPehL?f+QeT1lD><1GWqhe+UqfUm9LwY}xReJ5NuW7w4wyeboc8 zJY#7F%V1_v9}0`yryVw6u+(V0u2XP@1c(M)d91}j1_`<{kNq0bO_yjZ57|C8hu!ZD ztc5n=DPPts#2dK#aCGr+l8^&2rwy^(86ncnp>-np7dBUJChJbe_U%T({D(geQP#-LHo&c zY4Z`zun;a(9x0JaLu+Gq%-0ZbwzGDi2N_J(*gTSIX3Y$jmTqnIJ-a(Qe{q(nQ5hU- zYnm0do){p*WUAej5=1`+@TgY}^~_a&uJ%G#Uw&MLO|j8s3j7RsG3}reYc|i5X5i$b zGkfrOR=;+e$H-}a90y#Wx-#O{8J1Ik|2dvt()iV3kZ$(41ifRiW@eQk&inCXmng`} zAHpJ#w`Npgrm?69H+$<7x8AOm9J&DRK?Ruk#piP(UpE7qsgzSZz>4OL+F-=fjEAy9 zf*HCwZ}@M) zCRP#x#lkW;d#rqu&r1$f7Uy1WXnjt}d7w-~R|t$4Z%@P8uqh2=&6Yv-@x6>`u7&<2 zcbD-u&~9u~aCtSdXH!t8jLuygrUKFkR<)>SjXQOTTVIi( zF5*Vm+OaT(sw5y|nu9>`H;x};3AS6EwN+8NU|4yhF%~4er+R10-E_mw(5H(MbX6Z= zEbl4Kb0lPF2A?k}xh75}eF{|E86W29_|;XvMjK!=HffqF9TPMh|E@F_GIveRvwwt= z7rs!Wd`Jm9k4U9kPrgw0jSfb=o3CqsIv=-`$MzfBu@ETy=67r~&4}4N)-00X*}yyP zHE8AW=;k(|Hv`Qzd9646!vgrT_dYI4fK z{zCk;76Vw0#+W#|+&b&*5ZYh)t+@AS93yg1$&zJCu4m=gZK$t(G`1qSXs|Xr4K+v_ zbZu?2Jo_PM&Ur7M??YkTccPjiNlL8O2gj|LhXXu4Jexp++Gc9yQ?s*CraTCKS`6-mV%}(4eO6BE` zWtHZ3K1Ss6iL)EOsq*Biz`AWIMU}*@5<$dADV&i$RaX+R?>1<;+I{}0bDDUTQ(ctqGn?>C z5I&8SkzN$yO2n)&VMx*vwmrP#I8~rIb4S%H={kXDTbmG96%_e7j%>bDCBFZ4;rJ^6 zo>j_SiH}N5$sUNNvJ#E(o-&%bGGlRWEJ8HC1*c@%_Fd))D=B`Rh)T z?+Bcheaw^Zk1Ni^*8_>H76)AwA!e|^41M__ZC8&UaS;v`pJ*Xv6T!Rt*g#hwqb~LIbS)Cra82z zTu7o;A)Z}Kc*wti3+IOKYL2cme-kKis*o<&OxJ>kIpU5dK|z zwLLd^*)NN1**>QfXhl4R^D~4>|H{`4i_N|Q{14yE9xXK7a7W`lnn*4olG$?JM7~(w z0_b&wQ;_$M88Bg043xY$ED!-pA_9R5{+$VlibDUv;KC539+(~Y zM;b2hPXk;K3j4bOE+hp12ZM?HFFyD`?+S?iCj lCJL95_&*b7ASo%3yN9KlhmV_$El5N_SQy00s;H?1`VY(OZ0Myim5zm_k?xf4hJ(1YiuBSA(jeWE(v2Y9sdPv# zsQ29a=|1P&=ehs+H1p1He)G=PNta8Li&I1=EHyt0%&F>H($t}m!vXS-kBl#>4ady+ zIO&wt3f^_)!71mcpa0xEyJ0bld#&^vveNwMTi>dx!?3W`BPSuO2i8kA2Zee{bT)9$ zccoW;O|)>O$8!7de#tbj)zSd~>5LS=wI}_cd2b$wE?lz$Z-9q@s)DtvX770lp{(eG zx8>_8bNuL5(%z$x=1!V}H7O|qTs!uc5$}eumpZ4r*zZq1Fo`Xk-X^%$t_HDl9ypq; z#Q%xQUtwykJt=QAa8^1&1G9ZOv-+M!Q%ycJHSwS;+`nvl7RwR9@6YLel+Y*CciH_G z-R6IH+%rP{*Ip@Kx2jn(mgV7?*0>#-&NglJO#XT6yDves5w6# zDC%O~8=6m{Pw?F-+!E+6rS8v&@_2?bK7IEc(KMugh+4%2wzwvh;kE-ttQ4)&=eHzx zJBGra01fhczj+&Nm+0_U^vx!hCYS9(CkGE4jb%lVkb-M zdrXd!-zPduOg!GEE=?~iZlgB5iwa4}yy~kjG_ z{mHpg$4ZJy21tPXVS7yAS*1-uZO2K9)yK=i1jVDy9MX=@~3;gNk_0O%;R_vw5a$-dZVUpwtOEYn8~m!5G7b6v<3v-qtvF zCuNiK$vYz zw>hWzevq&GM~$Ap0q7ScZ)`yy6d*xlwJuWa zl@7KSmoy`s-{h=*5Y3WkQ$da`lId>tIvv9EBi_TYU7Ct%c&$fs`)+bf&|%{O{3bxC z;2MD!`tI?Ya*e3ef$U`CBwUp{vV@n2#}z$YdD9RT?b5@Lt_w=8D5wf2Dm)M$;$%*- znehIQmew$z7y`7CbSm?)Ak8~soPw)NEQl&~S|5YG-EG&_>dl*q7^KuWZ@Ny;<@Jbz zFX+A`X=M|pD7Bk~n!o2z*V}Yh!f{><#_ZRkr)MyIN(o`T@v~DBcL2ZmnDH;})j`ez zrA}vq;GWIAy4pSNuDBw<3rcT$O#sb^KpK^QX95n!uJ}uC5W)VswLI0c?&``JHjBBK z%Lt)D3qE6=9@L~jqZ8|mF_xNs%FmKcT2FuYV>UqHDtm_!1*ZBHp*r+hGWOz)Rb2); zw=@@w!>f#(Br#Pq@1p0G)@4_?mkFS8wuL^7w-ICJ;^KkKPkaPAT!sD8=qB}UjhIX; zS$#_4&7LyJ-}j^i8fL$Z+66OOpr>hYtfFTXhu#)QIy|AJ*6iL1-{p)zDaW)vlinJ_ z_teZr)NwpqSAuQy>{b%|pg?)}f80?rQSZ%V%s% zg{fVAjTN56OwScx6}ymIH_;7S&f#!>s>-7(BaXW8&5C)V*Poj!muzKHVHp4tuec9R zXQzul=43I(i43<5KJb0BG*PI)W@SN#tC`X9qH!ywi-PY$;A0v+FuZI-2Sr5fWEUHx zWFD3|nwIHfIw$S04*bHUh>$%#$kui^-+LXXJN^!rTT z9QkTS%9~%szXx#7;~Q75e9po$ZPY=sd05l>lI54)3nLBmqpX9swkI?yO-0?8^z#>K zTZS_E-IlIjULGs0+thu-HQk={^x@fiyHqOJLquKm*;3@maE&WERpT~V9V{;J{OtqJ z3Og)C(Dg?~V$U7HjFr&JNSBAqjF|AYGr|z8_U@72b}7LzVQc6Q72<1avbVXjdgbW+ z16}?#KIhK1d;Bk|)_9<-=cLK39dSg1`Iv9fEMAo|*OG^e26X`MUU}>z0jnO`#hAYE z)+MZOM62na&#Wux_q&lnEjF8rz9xseUVddNIg!6rhRnQAfMOOrKEk+Xyot-PlE*)t zwa5s)_^`a&j-)ks6CEFtZMW8_<9&zAV!GYe3q4J{OSFHLFqTNE!aUtgFae~;9o()? z8d9al-baZBQsj%)r^Sme!-wQ?87G_KvO9^cA`@erXfLd#A zv<(N!`sL4r3W8*d#On10sV}Enw%KBQFdCWc1G1Mj`KP!H5|ymxn~U=`YnCPNi5qF7 zT|%4pYtgq6wdTy!ZNrTj7xCQwSk;nIBvo%MHwfA84u8u~ z>P=g{J&wQc+W{mhkhNJY8djA$i0!W>70v*TT%6m5F!dC!Z(}s`#_2P;b;jC1>|6~z z$i>DL?@;fhOzTKR|G`rszt49_WYZwAwYQ}_+Ssr_vydJYVjvS-@m8_tzz3GUy%$af|iz7Zw$^r74}9YUv0$TW-W5FYPhxLsLe7M$4!ZB!l>0bCbZhC57^`iX~*veD`^rE6~<+wZH-m+ zEpL?d_y63i+MbU_>$rqSO5%6Zc$)oPYfq`|602RPcE@;FP#nYvr&W%#}{v>9iM6k4m02hrvnd3 zH8g=c9S1hH8KrZ@{E1NtW{q8UK#MH2YljoS?b$+_tC5O*xNE_0)+JM!)$Q|2}ma(hVme!Zqbo`ayF!#cx)zWo|~u#|W*oGE@rq$t1A+qYu09 zdiv9>h}d)yb4&^Xz%UQVkmx0O%E0e>Dmz5WlnS1GI15kAHsLV-4Y0CDKJpm&3Hd5SoS#WgkuO@x!TsOirzj-B*`iIxyEsN zqf+#$BXbm}S{UH9a=moI&o6>hmY8eYPftH?RnGpto8W$b-N1EX(`cI1&@T5ZWey=H z?HL_BItf;{kC1;#*QQu$7I^O_{x}L+gt^VQt{NKHm>}n`G;O~V`gL-D^b$rf74@(_ zuC4m|M<}-goGR{FI=aw4xkW!?HeuE!gC^%?X3^rSEy4cJCnJ9$iEEuRM87A|XKVX- zN;f9)zEGxd{Okrmm1#EDrMl(WafK9ad&bVDiLPsx2$4TtpjYsLadvlk>C;E|wu1d!oO4jd3&*A7 zk@0N(_=wuG<39A-a=YR&HormwgT7c3)xv#2B~J3ijY_BAUyBo8 zp1r=Y{cab1tu>Ue8C-d%x`WsQvn;C}hj60OV-}Rv9TUUy@1n$Gb#YsaY8z)}(`58b zJ^^TZEEg}PpI3Sa@w8by#1EX8{*>3skbF&9!IwVPKO6XV>|MO1Q6O)VR%yG@Vtx5T z+}IU%KJ>GjFyk9N1Ah7{xQdoA;aCU#9qR}DhjiGUna3U~0R>_MQe)jmj_dJ9gRWYb z09=@k&NuNJ9>-XmRlDq?k=A8uZqXgc3&P(%N>&q&kM{#Bb~&mg|9JPJwBmpkn03-5BGC(uA5h@J|2Fxh8T#UbLz-+ze*a7AJj&G>oS6#fdihbjKMI zs!Q7MlCZSR)&-nao&bi@t}fx{W5n?Au=2AE?R{=7DXH%ExySK2Yi&@sEOa7Gmv zmcT*TvA49ebWj>kg9TWkmKFlnEyIaeEI?QLv#QAy^5vyZO_5Jak0tXbhE=^T@wCEJ zbl*Lb$k1yOp906@yI<4U zB8pRrR$jgFB*#8!>mT$YPb@(o1?_KF=!}BOVqy){Q?E+#EJbs9TE;OkM&xJ-2o?ss z=~M_Lb$GyK2kN%cdTAeGN-Y{xbTpWSe6OES#uK730;;E$1ODh6+9JWj~Cc%K(rd8H%c?{$})GL;Uc`shK7vKuDMxrUl(a@?iX zi=Yh6@Y*3)LOKcoK0=}>aD7ME^Q{{qS<@l|l5)`7Z)D-)p;f85aqc+eSbo%>TBoD@ z2NcWMdFyx0zk*yGI*FMt&FQ?2{3v(I8puVPcXd2xfHS9kJ4#a)p&$C9Z8$;}L~Jq%dZ*Ous%&5-UbRErpNGQ=OLdFHbQe?|rI9^p|E17i`yP zGSq`c;44(qQVXs~iBQ$S_7Z&aRy+=|v9__R?OD(tw^&iWZE92u%W5YflwBzouHP)QTU@NY0zA1-}ZghJe^(8JqNv4x$oF zzU8dgX!x{v70>`pdWc&=cGqRSL zzz_1?Cy@QMl6^&6QQ8B&^*u*`<8NTR2X#jeBcu4(>$$M7$AgHPn8EemF%JNh%s)vFu8} zj-G7kxlHuL^Y!3?rR0W??Em%{b_Z_`9K_=qM20Z2I45)KcP{5LM#*xN$Ah12Wdk#+ zdKSum(wvcoDuG?nL?O+G=^M{g(Vi3?uFWBN-DJC8@-Xm$H|I<%tX&2!uE zyp6j)-*v6N&iv3U#or*&ZR_2T=iO42`_%=bA?6=-z}hAgDv^+u5clOJqVqM2t9W>L zFhkJ#@XnfBJtI3tYNBcvW48XCKY>RiE`f#tAY8{t!;23V5wWzg6co1Lg$oK;^Fkoj zR=fg#4_=tCrGT{s1ZoL=WrK00cm9up2_R`w2rm?&4MDts3cY|LFlr#ae~|Z}H~&!= zhMPg=KMTe)F#kuvx*3LU01*U=fFPhkf4k){J^f#+ZYDi(5$6AXy8yEbGx7gS1mFTt z=s%e-0s;9KgTW9O9cGTl|Js2;pioRaGnKgDKhMB~g@ymcgy8?W4+en=VmAJ-24Of9 z@y`Z9n83drgkeH(420$Xa)65b+e=8`-wXy7!UVI3naCoAg%Gj=NSL6s9Q1E9Sy_2` u0i-+xE`*R4h6*Aj#Qxue39*C(v8R`XhnJs+wGA;GA_603V?(OT6aN>`_e5v_ diff --git a/zlib.h b/zlib.h index db47bf8..d65af43 100644 --- a/zlib.h +++ b/zlib.h @@ -1,5 +1,5 @@ /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.6.1, January xxth, 2012 + version 1.2.6.1, February 12th, 2012 Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler @@ -37,7 +37,7 @@ extern "C" { #endif -#define ZLIB_VERSION "1.2.6.1-motley" +#define ZLIB_VERSION "1.2.6.1" #define ZLIB_VERNUM 0x1261 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 2 diff --git a/zutil.c b/zutil.c index 12517b4..65e0d3b 100644 --- a/zutil.c +++ b/zutil.c @@ -1,5 +1,5 @@ /* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2005, 2010, 2011 Jean-loup Gailly. + * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/zutil.h b/zutil.h index 2f4d14d..69d83ed 100644 --- a/zutil.h +++ b/zutil.h @@ -1,5 +1,5 @@ /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2011 Jean-loup Gailly. + * Copyright (C) 1995-2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -255,7 +255,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define ZSWAP32(q) __builtin_bswap32(q) #else # define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ - (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) + (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) #endif #endif /* ZUTIL_H */