[U-Boot] [PATCH] lib: zlib: update to 1.2.6

[Lei Wen]

Hi Wolfgang,

On Wed, Mar 7, 2012 at 7:56 PM, Wolfgang Denk <wd at denx.de> wrote:
> Dear Lei Wen,
>
> In message <CALZhoST8b_gwi=b696BcNCedoYSNs7Mb3qihioeLAzShSHwArw at mail.gmail.com> you wrote:
>> --20cf300fafe1db2c6604ba8f33fe
>> Content-Type: text/plain; charset=ISO-8859-1
>>
>> Hi,
>>
>> In this patch, I update the current zlib from 1.2.5 to 1.2.6.
>>
>> There is a lot of warnings when using checkpatch script, I don't know whether
>> I should fix it or not...
>> Since it is just copy from as it is from upstream zlib 1.2.6, so I didn't do
>> the correction, so don't be panic when use checkpatch.
>>
>> Best regards,
>> Lei
>
> This text should not be here.  It would become part of the commit
> message.  Please add such comments only to the comment section, i. e.
> below the '---' line.

Opps, sorry for this...

>
>> ========================================================
>> As it copy from zlib home page, the improvement from 1.2.5 to 1.2.6
>> contains following:
>>
>> gzread() can now read a file that is being written concurrently
>> gzgetc() is now a macro for increased speed
>> Added a 'T' option to gzopen() for transparent writing (no compression)
>> Added deflatePending() to return the amount of pending output
>> Allow deflateSetDictionary() and inflateSetDictionary() at any time in
>> raw mode
>> deflatePrime() can now insert bits in the middle of the stream
>> ./configure now creates a configure.log file with all of the results
>> Added a ./configure --solo option to compile zlib with no dependency on
>> any libraries
>> Fixed a problem with large file support macros
>> Fixed a bug in contrib/puff
>> Many portability improvements
>
> Unfortunately the new code is not even compile clean:
>
> -> ./MAKEALL m28evk
> Configuring for m28evk board...
> In file included from /home/wd/git/u-boot/tmp/lib/crc32.c:20:0:
> /home/wd/git/u-boot/tmp/include/u-boot/zlib.h:86:5: error: unknown type name ‘z_const’
> /home/wd/git/u-boot/tmp/include/u-boot/zlib.h:86:19: error: expected ‘:’, ‘,’, ‘;’, ‘}’ or ‘__attribute__’ before ‘*’ token
> In file included from /home/wd/git/u-boot/tmp/lib/crc32.c:20:0:
> /home/wd/git/u-boot/tmp/include/u-boot/zlib.h:1326:21: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘Z_ARG’
> make[1]: *** [crc32.o] Error 1
> make[1]: *** Waiting for unfinished jobs....
> make: *** [tools] Error 2
>

I miss add the zconf.h into the patch...
V2 patch is attached...

>
> Best regards,
>
> Wolfgang Denk
>

Thanks,
Lei
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-lib-zlib-update-to-1.2.6.patch
Type: application/octet-stream
Size: 206719 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120307/ac30e7e2/attachment-0001.obj>