diff options
| author | Xavier Roche <roche@httrack.com> | 2023-11-18 11:03:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-18 11:03:53 +0100 |
| commit | 300f906d7829293715f8e35855207ff42a395d8d (patch) | |
| tree | 5394f22a853dbf11c12d2b4deae43d06bac34e0d /src/minizip/ioapi.c.diff | |
| parent | 8316bc0e974c2a84a35f2175d413804c9b5be90c (diff) | |
| parent | 3bffe8ca4659fbca47dcc8fba0472fadcf659a51 (diff) | |
Merge pull request #265 from jayaddison/maintenance/update-zlib-1.3
Maintenance: update vendored minizip code to the version distributed with zlib v1.3
Diffstat (limited to 'src/minizip/ioapi.c.diff')
| -rw-r--r-- | src/minizip/ioapi.c.diff | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/src/minizip/ioapi.c.diff b/src/minizip/ioapi.c.diff index c42c349..ba93c23 100644 --- a/src/minizip/ioapi.c.diff +++ b/src/minizip/ioapi.c.diff @@ -1,32 +1,23 @@ ---- ioapi.c.orig 2014-06-10 18:55:32.778807408 +0200 -+++ ioapi.c 2014-06-22 12:22:06.606696274 +0200 +--- ioapi.c.orig 2023-11-17 16:21:50.355864777 +0000 ++++ ioapi.c 2023-11-17 16:21:50.355864777 +0000 @@ -14,7 +14,7 @@ #define _CRT_SECURE_NO_WARNINGS #endif --#if defined(__APPLE__) || defined(IOAPI_NO_64) -+#if defined(__APPLE__) || defined(__ANDROID__) || defined(IOAPI_NO_64) +-#if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) ++#if defined(__APPLE__) || defined(__ANDROID__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions #define FOPEN_FUNC(filename, mode) fopen(filename, mode) #define FTELLO_FUNC(stream) ftello(stream) -@@ -73,6 +73,7 @@ - p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file; +@@ -68,6 +68,7 @@ + p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file; p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file; p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file; + p_filefunc64_32->zfile_func64.zflush_file = p_filefunc32->zflush_file; p_filefunc64_32->zfile_func64.ztell64_file = NULL; p_filefunc64_32->zfile_func64.zseek64_file = NULL; p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file; -@@ -89,6 +90,8 @@ - static uLong ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size)); - static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream)); - static long ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)); -+static int ZCALLBACK fflush_file_func OF((voidpf opaque, voidpf stream)); -+ - static int ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream)); - static int ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream)); - -@@ -206,6 +209,12 @@ +@@ -193,6 +194,12 @@ return ret; } @@ -37,18 +28,9 @@ + return ret; +} - static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream) - { -@@ -221,14 +230,14 @@ - return ret; - } - --void fill_fopen_filefunc (pzlib_filefunc_def) -- zlib_filefunc_def* pzlib_filefunc_def; -+void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def) - { - pzlib_filefunc_def->zopen_file = fopen_file_func; - pzlib_filefunc_def->zread_file = fread_file_func; + static int ZCALLBACK fclose_file_func(voidpf opaque, voidpf stream) { + int ret; +@@ -214,6 +221,7 @@ pzlib_filefunc_def->zwrite_file = fwrite_file_func; pzlib_filefunc_def->ztell_file = ftell_file_func; pzlib_filefunc_def->zseek_file = fseek_file_func; @@ -56,7 +38,7 @@ pzlib_filefunc_def->zclose_file = fclose_file_func; pzlib_filefunc_def->zerror_file = ferror_file_func; pzlib_filefunc_def->opaque = NULL; -@@ -241,6 +250,7 @@ +@@ -225,6 +233,7 @@ pzlib_filefunc_def->zwrite_file = fwrite_file_func; pzlib_filefunc_def->ztell64_file = ftell64_file_func; pzlib_filefunc_def->zseek64_file = fseek64_file_func; |