diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2014-06-08 20:00:57 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2014-06-08 20:00:57 +0000 |
| commit | eeee43acb768e8919559927ebffc31bc91447bec (patch) | |
| tree | 284c2ff49fb164007326f9f4a2b4b3f36e6b92ae /src/minizip/ioapi.h.diff | |
| parent | 91946b783499479fe65955bdad7865fd967934ea (diff) | |
Added minizip orig files.
Diffstat (limited to 'src/minizip/ioapi.h.diff')
| -rw-r--r-- | src/minizip/ioapi.h.diff | 45 |
1 files changed, 35 insertions, 10 deletions
diff --git a/src/minizip/ioapi.h.diff b/src/minizip/ioapi.h.diff index ddcec6c..7946a20 100644 --- a/src/minizip/ioapi.h.diff +++ b/src/minizip/ioapi.h.diff @@ -1,34 +1,59 @@ ---- ioapi.h.orig 2012-01-17 03:51:31.000000000 +0100 -+++ ioapi.h 2014-05-24 13:27:22.516230485 +0200 -@@ -135,6 +135,7 @@ +--- ioapi.h 2014-06-08 21:54:18.326360527 +0200 ++++ ioapi.h.orig 2012-01-17 03:51:31.000000000 +0100 +@@ -67,24 +67,6 @@ + #endif + #endif + +-/* As reported by sammyx, z_crc_t and z_const are not defined in pre-1.2.70 releases of zlib */ +-/* See <https://github.com/madler/zlib/commit/6c9bd474aa08312ef2e2e9655a80e18db24a1680#diff-d466aa66f7e453e0c8a7719229cff391R391> */ +-#if ZLIB_VERNUM < 0x1270 +- +-#ifdef Z_U4 +- typedef Z_U4 z_crc_t; +-#else +- typedef unsigned long z_crc_t; +-#endif +- +-#if defined(ZLIB_CONST) && !defined(z_const) +-# define z_const const +-#else +-# define z_const +-#endif +- +-#endif +- + /* + #ifndef ZPOS64_T + #ifdef _WIN32 +@@ -153,7 +135,6 @@ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); -+typedef int (ZCALLBACK *flush_file_func) OF((voidpf opaque, voidpf stream)); +-typedef int (ZCALLBACK *flush_file_func) OF((voidpf opaque, voidpf stream)); typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream)); typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream)); -@@ -148,6 +149,7 @@ +@@ -167,7 +148,6 @@ open_file_func zopen_file; read_file_func zread_file; write_file_func zwrite_file; -+ flush_file_func zflush_file; +- flush_file_func zflush_file; tell_file_func ztell_file; seek_file_func zseek_file; close_file_func zclose_file; -@@ -164,6 +166,7 @@ +@@ -184,7 +164,6 @@ open64_file_func zopen64_file; read_file_func zread_file; write_file_func zwrite_file; -+ flush_file_func zflush_file; +- flush_file_func zflush_file; tell64_file_func ztell64_file; seek64_file_func zseek64_file; close_file_func zclose_file; -@@ -186,6 +189,7 @@ +@@ -207,7 +186,6 @@ #define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) #define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) -+#define ZFLUSH64(filefunc,filestream) ((*((filefunc).zfile_func64.zflush_file)) ((filefunc).zfile_func64.opaque,filestream)) +-#define ZFLUSH64(filefunc,filestream) ((*((filefunc).zfile_func64.zflush_file)) ((filefunc).zfile_func64.opaque,filestream)) //#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream)) //#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode)) #define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream)) |