From a193cca9ad9a2ff07a4444bb5f26dbb85eed2925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Mon, 27 Jan 2014 15:04:36 +0100 Subject: [PATCH] 2014-01-27 15:04 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/3rd/zlib/zutil.c ! do not define dummy errno variable in WinCE builds - it's probably some dummy old code not necessary in current ZLIB versions * src/3rd/zlib/zlib.dif * rediffed --- ChangeLog.txt | 8 ++++++++ src/3rd/zlib/zlib.dif | 38 +++++++++++++++++++------------------- src/3rd/zlib/zutil.c | 2 +- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 5d5d3b196b..236c24f0d6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,14 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2014-01-27 15:04 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/3rd/zlib/zutil.c + ! do not define dummy errno variable in WinCE builds - it's probably + some dummy old code not necessary in current ZLIB versions + + * src/3rd/zlib/zlib.dif + * rediffed + 2014-01-25 00:33 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/hbct/charlist.c ! fixed possible heap memory buffer overflow in diff --git a/src/3rd/zlib/zlib.dif b/src/3rd/zlib/zlib.dif index 563ebbff5a..5dda1fc34c 100644 --- a/src/3rd/zlib/zlib.dif +++ b/src/3rd/zlib/zlib.dif @@ -1,6 +1,6 @@ diff -urN zlib.orig/crc32.c zlib/crc32.c ---- zlib.orig/crc32.c 2014-01-24 13:47:54.784020679 +0100 -+++ zlib/crc32.c 2014-01-24 13:47:54.784020679 +0100 +--- zlib.orig/crc32.c 2014-01-27 15:01:38.484007408 +0100 ++++ zlib/crc32.c 2014-01-27 15:01:38.504007407 +0100 @@ -21,6 +21,8 @@ DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h. */ @@ -11,8 +11,8 @@ diff -urN zlib.orig/crc32.c zlib/crc32.c # include # ifndef DYNAMIC_CRC_TABLE diff -urN zlib.orig/deflate.c zlib/deflate.c ---- zlib.orig/deflate.c 2014-01-24 13:47:54.796020679 +0100 -+++ zlib/deflate.c 2014-01-24 13:47:54.796020679 +0100 +--- zlib.orig/deflate.c 2014-01-27 15:01:38.512007409 +0100 ++++ zlib/deflate.c 2014-01-27 15:01:38.544007409 +0100 @@ -51,6 +51,10 @@ #include "deflate.h" @@ -50,8 +50,8 @@ diff -urN zlib.orig/deflate.c zlib/deflate.c for (;;) { diff -urN zlib.orig/gzguts.h zlib/gzguts.h ---- zlib.orig/gzguts.h 2014-01-24 13:47:54.796020679 +0100 -+++ zlib/gzguts.h 2014-01-24 13:47:54.796020679 +0100 +--- zlib.orig/gzguts.h 2014-01-27 15:01:38.544007409 +0100 ++++ zlib/gzguts.h 2014-01-27 15:01:38.544007409 +0100 @@ -31,7 +31,8 @@ # include #endif @@ -73,8 +73,8 @@ diff -urN zlib.orig/gzguts.h zlib/gzguts.h # define HAVE_VSNPRINTF # endif diff -urN zlib.orig/gzlib.c zlib/gzlib.c ---- zlib.orig/gzlib.c 2014-01-24 13:47:54.796020679 +0100 -+++ zlib/gzlib.c 2014-01-24 13:47:54.796020679 +0100 +--- zlib.orig/gzlib.c 2014-01-27 15:01:38.548007409 +0100 ++++ zlib/gzlib.c 2014-01-27 15:01:38.548007409 +0100 @@ -5,7 +5,11 @@ #include "gzguts.h" @@ -89,8 +89,8 @@ diff -urN zlib.orig/gzlib.c zlib/gzlib.c #else #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 diff -urN zlib.orig/inflate.c zlib/inflate.c ---- zlib.orig/inflate.c 2014-01-24 13:47:54.808020680 +0100 -+++ zlib/inflate.c 2014-01-24 13:47:54.808020680 +0100 +--- zlib.orig/inflate.c 2014-01-27 15:01:38.560007409 +0100 ++++ zlib/inflate.c 2014-01-27 15:01:38.560007409 +0100 @@ -429,6 +429,7 @@ /* Macros for inflate(): */ @@ -100,8 +100,8 @@ diff -urN zlib.orig/inflate.c zlib/inflate.c # define UPDATE(check, buf, len) \ (state->flags ? crc32(check, buf, len) : adler32(check, buf, len)) diff -urN zlib.orig/zconf.h zlib/zconf.h ---- zlib.orig/zconf.h 2014-01-24 13:47:54.816020680 +0100 -+++ zlib/zconf.h 2014-01-24 13:47:54.816020680 +0100 +--- zlib.orig/zconf.h 2014-01-27 15:01:38.568007410 +0100 ++++ zlib/zconf.h 2014-01-27 15:01:38.568007410 +0100 @@ -161,7 +161,18 @@ #if defined(_WINDOWS) && !defined(WINDOWS) # define WINDOWS @@ -140,8 +140,8 @@ diff -urN zlib.orig/zconf.h zlib/zconf.h #ifndef ZEXTERN # define ZEXTERN extern diff -urN zlib.orig/zlib.h zlib/zlib.h ---- zlib.orig/zlib.h 2014-01-24 13:47:54.820020680 +0100 -+++ zlib/zlib.h 2014-01-24 13:47:54.820020680 +0100 +--- zlib.orig/zlib.h 2014-01-27 15:01:38.572007410 +0100 ++++ zlib/zlib.h 2014-01-27 15:01:38.584007410 +0100 @@ -1728,6 +1728,8 @@ ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile)); ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); @@ -152,20 +152,20 @@ diff -urN zlib.orig/zlib.h zlib/zlib.h #else /* Z_SOLO */ diff -urN zlib.orig/zutil.c zlib/zutil.c ---- zlib.orig/zutil.c 2014-01-24 13:47:54.820020680 +0100 -+++ zlib/zutil.c 2014-01-24 13:47:54.820020680 +0100 +--- zlib.orig/zutil.c 2014-01-27 15:01:38.584007410 +0100 ++++ zlib/zutil.c 2014-01-27 15:01:38.584007410 +0100 @@ -139,7 +139,7 @@ return ERR_MSG(err); } -#if defined(_WIN32_WCE) -+#if defined(_WINCE) ++#if defined(_WINCE) && 0 /* The Microsoft C Run-Time Library for Windows CE doesn't have * errno. We define it as a global variable to simplify porting. * Its value is always 0 and should not be used. diff -urN zlib.orig/zutil.h zlib/zutil.h ---- zlib.orig/zutil.h 2014-01-24 13:47:54.824020680 +0100 -+++ zlib/zutil.h 2014-01-24 13:47:54.824020680 +0100 +--- zlib.orig/zutil.h 2014-01-27 15:01:38.584007410 +0100 ++++ zlib/zutil.h 2014-01-27 15:01:38.584007410 +0100 @@ -22,7 +22,7 @@ #include "zlib.h" diff --git a/src/3rd/zlib/zutil.c b/src/3rd/zlib/zutil.c index 09682ae8c6..168320b490 100644 --- a/src/3rd/zlib/zutil.c +++ b/src/3rd/zlib/zutil.c @@ -139,7 +139,7 @@ const char * ZEXPORT zError(err) return ERR_MSG(err); } -#if defined(_WINCE) +#if defined(_WINCE) && 0 /* The Microsoft C Run-Time Library for Windows CE doesn't have * errno. We define it as a global variable to simplify porting. * Its value is always 0 and should not be used.