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

2012-02-18 13:37 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* src/3rd/zlib/zlib.dif
    ! rediffed
This commit is contained in:
Viktor Szakats
2012-02-18 12:38:12 +00:00
parent de755848ab
commit 425f3734a9
2 changed files with 72 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -16,6 +16,10 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-02-18 13:37 UTC+0100 Viktor Szakats (harbour syenar.net)
* src/3rd/zlib/zlib.dif
! rediffed
2012-02-17 21:04 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/include/hbcom.ch
* harbour/src/rtl/hbcom.c

86
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 Tue Feb 07 23:16:42 2012
+++ zlib\crc32.c Tue Feb 07 23:16:42 2012
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
@@ -21,6 +21,8 @@
DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
*/
@@ -10,9 +10,9 @@ diff -urN zlib.orig\crc32.c zlib\crc32.c
#ifdef MAKECRCH
# include <stdio.h>
# ifndef DYNAMIC_CRC_TABLE
diff -urN zlib.orig\deflate.c zlib\deflate.c
--- zlib.orig\deflate.c Tue Feb 07 23:16:42 2012
+++ zlib\deflate.c Tue Feb 07 23:16:42 2012
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
@@ -51,6 +51,10 @@
#include "deflate.h"
@@ -49,9 +49,47 @@ diff -urN zlib.orig\deflate.c zlib\deflate.c
Bytef *scan, *strend; /* scan goes up to strend for length of run */
for (;;) {
diff -urN zlib.orig\inflate.c zlib\inflate.c
--- zlib.orig\inflate.c Tue Feb 07 23:16:42 2012
+++ zlib\inflate.c Tue Feb 07 23:16:42 2012
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
@@ -27,7 +27,7 @@
#endif
#include <fcntl.h>
-#ifdef __TURBOC__
+#if defined(__TURBOC__) || defined(__XCC__) || defined(__POCC__)
# include <io.h>
#endif
@@ -35,7 +35,8 @@
# define NO_GZCOMPRESS
#endif
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) || \
+ defined(__WATCOMC__)
# ifndef HAVE_VSNPRINTF
# 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
@@ -5,7 +5,11 @@
#include "gzguts.h"
-#if defined(_WIN32) && !defined(__BORLANDC__)
+#if defined(__XCC__)
+# define LSEEK lseek
+#elif defined(__POCC__)
+# define LSEEK _lseek64
+#elif defined(_WIN32) && !defined(__BORLANDC__)
# define LSEEK _lseeki64
#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
@@ -428,6 +428,7 @@
/* Macros for inflate(): */
@@ -60,9 +98,9 @@ diff -urN zlib.orig\inflate.c zlib\inflate.c
#ifdef GUNZIP
# 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 Tue Feb 07 23:16:42 2012
+++ zlib\zconf.h Tue Feb 07 23:16:42 2012
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
@@ -158,7 +158,18 @@
#if defined(_WINDOWS) && !defined(WINDOWS)
# define WINDOWS
@@ -83,9 +121,21 @@ diff -urN zlib.orig\zconf.h zlib\zconf.h
# ifndef WIN32
# define WIN32
# endif
diff -urN zlib.orig\zutil.c zlib\zutil.c
--- zlib.orig\zutil.c Tue Feb 07 23:16:42 2012
+++ zlib\zutil.c Tue Feb 07 23:16:42 2012
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
@@ -1700,6 +1700,8 @@
ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
#endif
#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
@@ -116,7 +116,7 @@
return ERR_MSG(err);
}
@@ -95,9 +145,9 @@ diff -urN zlib.orig\zutil.c zlib\zutil.c
/* 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 Tue Feb 07 23:16:42 2012
+++ zlib\zutil.h Tue Feb 07 23:16:42 2012
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
@@ -22,7 +22,7 @@
#include "zlib.h"