diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bc121dd65c..f5c3506c9e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2010-11-03 11:29 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/external/minizip/minizip.dif + * regenerated .diff file by ../../bin/hbxpatch.hbs -rediff + Thanks to Tamas. + 2010-11-03 02:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * external/sqlite3/Makefile + Cygwin patch from Tamas Tevesz. diff --git a/harbour/external/minizip/minizip.dif b/harbour/external/minizip/minizip.dif index ceb35977f1..dff22cad11 100644 --- a/harbour/external/minizip/minizip.dif +++ b/harbour/external/minizip/minizip.dif @@ -1,6 +1,6 @@ diff -urN minizip.orig/crypt.h minizip/crypt.h ---- minizip.orig/crypt.h 2010-07-22 00:54:22.350236245 +0200 -+++ minizip/crypt.h 2010-07-22 00:54:22.350236245 +0200 +--- minizip.orig/crypt.h 2010-11-03 11:26:37.402152577 +0100 ++++ minizip/crypt.h 2010-11-03 11:26:37.402152577 +0100 @@ -38,6 +38,8 @@ * unpredictable manner on 16-bit systems; not a problem * with any known compiler so far, though */ @@ -11,8 +11,8 @@ diff -urN minizip.orig/crypt.h minizip/crypt.h return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); } diff -urN minizip.orig/ioapi.c minizip/ioapi.c ---- minizip.orig/ioapi.c 2010-07-22 00:54:22.350236245 +0200 -+++ minizip/ioapi.c 2010-07-22 00:54:22.360235636 +0200 +--- minizip.orig/ioapi.c 2010-11-03 11:26:37.404151830 +0100 ++++ minizip/ioapi.c 2010-11-03 11:26:37.404151830 +0100 @@ -15,6 +15,7 @@ #endif @@ -143,14 +143,18 @@ diff -urN minizip.orig/ioapi.c minizip/ioapi.c pzlib_filefunc_def->zopen_file = fopen_file_func; pzlib_filefunc_def->zread_file = fread_file_func; diff -urN minizip.orig/ioapi.h minizip/ioapi.h ---- minizip.orig/ioapi.h 2010-07-22 00:54:22.370235865 +0200 -+++ minizip/ioapi.h 2010-07-22 00:54:22.370235865 +0200 -@@ -21,29 +21,53 @@ +--- minizip.orig/ioapi.h 2010-11-03 11:26:37.405152115 +0100 ++++ minizip/ioapi.h 2010-11-03 11:26:37.405152115 +0100 +@@ -21,29 +21,54 @@ #ifndef _ZLIBIOAPI64_H #define _ZLIBIOAPI64_H -#if (!defined(_WIN32)) && (!defined(WIN32)) -- ++#if !(defined(_WIN32) || defined(WIN32)) && \ ++ !(defined(__MSDOS__) || defined(MSDOS)) && \ ++ !(defined(OS_2) || defined(__OS2__) || defined(OS2)) && \ ++ !defined(__WATCOMC__) + - // Linux needs this to support file operation on files larger then 4+GB - // But might need better if/def to select just the platforms that needs them. - @@ -166,11 +170,6 @@ diff -urN minizip.orig/ioapi.h minizip/ioapi.h - #ifndef _FILE_OFFSET_BIT - #define _FILE_OFFSET_BIT 64 - #endif -+#if !(defined(_WIN32) || defined(WIN32)) && \ -+ !(defined(__MSDOS__) || defined(MSDOS)) && \ -+ !(defined(OS_2) || defined(__OS2__) || defined(OS2)) && \ -+ !defined(__WATCOMC__) -+ + /* Linux needs this to support file operation on files larger then 4+GB + * on 32bit platforms + * But might need better if/def to select just the platforms that needs them. @@ -205,6 +204,7 @@ diff -urN minizip.orig/ioapi.h minizip/ioapi.h +#if defined( __BORLANDC__ ) || \ + defined( __WATCOMC__ ) || \ + defined( __MINGW32CE__ ) || \ ++ defined( __DMC__ ) || \ + defined( HB_OS_VXWORKS ) || \ + defined( HB_OS_BSD ) || \ + defined( HB_OS_DARWIN ) || \ @@ -217,8 +217,8 @@ diff -urN minizip.orig/ioapi.h minizip/ioapi.h #define fopen64 fopen #define ftello64 ftell diff -urN minizip.orig/unzip.c minizip/unzip.c ---- minizip.orig/unzip.c 2010-07-22 00:54:22.420234776 +0200 -+++ minizip/unzip.c 2010-07-22 00:54:22.430235285 +0200 +--- minizip.orig/unzip.c 2010-11-03 11:26:37.421148915 +0100 ++++ minizip/unzip.c 2010-11-03 11:26:37.421148915 +0100 @@ -68,13 +68,17 @@ #include #include @@ -306,8 +306,8 @@ diff -urN minizip.orig/unzip.c minizip/unzip.c pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc; pfile_in_zip_read_info->crc32=0; diff -urN minizip.orig/zip.c minizip/zip.c ---- minizip.orig/zip.c 2010-07-22 00:54:22.480235591 +0200 -+++ minizip/zip.c 2010-07-22 00:54:22.480235591 +0200 +--- minizip.orig/zip.c 2010-11-03 11:26:37.438151771 +0100 ++++ minizip/zip.c 2010-11-03 11:26:37.439149311 +0100 @@ -29,16 +29,20 @@ #include "zlib.h" #include "zip.h"