fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-02-20 18:12 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* harbour/src/3rd/zlib/zlib.dif
    * rediffed with ../../../bin/hb3rdpat.hbs -rediff
      Thanks to Viktor for the info.
This commit is contained in:
Przemyslaw Czerpak
2012-02-20 17:13:09 +00:00
parent f3ec4bbc7c
commit e956689656
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-02-20 18:12 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/src/3rd/zlib/zlib.dif
* rediffed with ../../../bin/hb3rdpat.hbs -rediff
Thanks to Viktor for the info.
2012-02-20 16:25 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/src/3rd/zlib/gzlib.c
! do not use _lseeki64 in MinGWCE builds - such function does not

38
harbour/src/3rd/zlib/zlib.dif
View File

@@ -1,6 +1,6 @@
diff -urN zlib.orig/crc32.c zlib/crc32.c
--- zlib.orig/crc32.c 2012-02-18 13:22:23.000000000 +0100
+++ zlib/crc32.c 2012-02-18 13:22:23.000000000 +0100
--- zlib.orig/crc32.c 2012-02-20 18:10:29.117276484 +0100
+++ zlib/crc32.c 2012-02-20 18:10:29.117276484 +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 <stdio.h>
# ifndef DYNAMIC_CRC_TABLE
diff -urN zlib.orig/deflate.c zlib/deflate.c
--- zlib.orig/deflate.c 2012-02-18 13:22:23.000000000 +0100
+++ zlib/deflate.c 2012-02-18 13:22:23.000000000 +0100
--- zlib.orig/deflate.c 2012-02-20 18:10:29.187276484 +0100
+++ zlib/deflate.c 2012-02-20 18:10:29.217276484 +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 2012-02-18 13:22:23.000000000 +0100
+++ zlib/gzguts.h 2012-02-18 13:22:23.000000000 +0100
--- zlib.orig/gzguts.h 2012-02-20 18:10:29.237276484 +0100
+++ zlib/gzguts.h 2012-02-20 18:10:29.267276484 +0100
@@ -27,7 +27,7 @@
#endif
#include <fcntl.h>
@@ -72,14 +72,14 @@ 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 2012-02-18 13:22:23.000000000 +0100
+++ zlib/gzlib.c 2012-02-18 13:22:23.000000000 +0100
--- zlib.orig/gzlib.c 2012-02-20 18:10:29.277276484 +0100
+++ zlib/gzlib.c 2012-02-20 18:10:29.277276484 +0100
@@ -5,7 +5,11 @@
#include "gzguts.h"
-#if defined(_WIN32) && !defined(__BORLANDC__)
+#if defined(__XCC__)
+#if defined(__XCC__) || defined(__MINGW32CE__)
+# define LSEEK lseek
+#elif defined(__POCC__)
+# define LSEEK _lseek64
@@ -88,8 +88,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 2012-02-18 13:22:23.000000000 +0100
+++ zlib/inflate.c 2012-02-18 13:22:23.000000000 +0100
--- zlib.orig/inflate.c 2012-02-20 18:10:29.357276484 +0100
+++ zlib/inflate.c 2012-02-20 18:10:29.357276484 +0100
@@ -428,6 +428,7 @@
/* Macros for inflate(): */
@@ -99,8 +99,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 2012-02-18 13:22:23.000000000 +0100
+++ zlib/zconf.h 2012-02-18 13:22:23.000000000 +0100
--- zlib.orig/zconf.h 2012-02-20 18:10:29.477276484 +0100
+++ zlib/zconf.h 2012-02-20 18:10:29.477276484 +0100
@@ -158,7 +158,18 @@
#if defined(_WINDOWS) && !defined(WINDOWS)
# define WINDOWS
@@ -122,8 +122,8 @@ diff -urN zlib.orig/zconf.h zlib/zconf.h
# define WIN32
# endif
diff -urN zlib.orig/zlib.h zlib/zlib.h
--- zlib.orig/zlib.h 2012-02-18 13:22:23.000000000 +0100
+++ zlib/zlib.h 2012-02-18 13:22:23.000000000 +0100
--- zlib.orig/zlib.h 2012-02-20 18:10:29.507276484 +0100
+++ zlib/zlib.h 2012-02-20 18:10:29.527276484 +0100
@@ -1700,6 +1700,8 @@
ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
@@ -134,8 +134,8 @@ 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 2012-02-18 13:22:23.000000000 +0100
+++ zlib/zutil.c 2012-02-18 13:22:23.000000000 +0100
--- zlib.orig/zutil.c 2012-02-20 18:10:29.537276484 +0100
+++ zlib/zutil.c 2012-02-20 18:10:29.537276484 +0100
@@ -116,7 +116,7 @@
return ERR_MSG(err);
}
@@ -146,8 +146,8 @@ diff -urN zlib.orig/zutil.c zlib/zutil.c
* 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 2012-02-18 13:22:23.000000000 +0100
+++ zlib/zutil.h 2012-02-18 13:22:23.000000000 +0100
--- zlib.orig/zutil.h 2012-02-20 18:10:29.537276484 +0100
+++ zlib/zutil.h 2012-02-20 18:10:29.547276484 +0100
@@ -22,7 +22,7 @@
#include "zlib.h"