Upgraded to minizip 1.1 from zlib 1.2.8

1 files changed, 18 insertions, 36 deletions

diff --git a/src/minizip/ioapi.h.diff b/src/minizip/ioapi.h.diff
index 53fa38d..6f17bc4 100644
--- a/src/minizip/ioapi.h.diff
+++ b/src/minizip/ioapi.h.diff
@@ -1,36 +1,18 @@
---- ioapi.h.orig	2014-05-23 15:29:40.979965126 +0200
-+++ ioapi.h	2014-05-23 15:29:40.979965126 +0200
-@@ -35,11 +35,17 @@
- extern "C" {

- #endif

- 

-+/* fixed missing define on some zlib (Lars Wendler) */
-+#ifndef OF
-+#define OF(args) args
-+#endif
-+
- 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 long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));

- typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));

-+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));

- 

-@@ -50,6 +56,7 @@
-     write_file_func     zwrite_file;

-     tell_file_func      ztell_file;

-     seek_file_func      zseek_file;

-+    flush_file_func     zflush_file;
-     close_file_func     zclose_file;

-     testerror_file_func zerror_file;

-     voidpf              opaque;

-@@ -63,6 +70,7 @@
- #define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))

- #define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))

- #define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))

-+#define ZFLUSH(filefunc,filestream) ((*((filefunc).zflush_file))((filefunc).opaque,filestream))
- #define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))

- #define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))

- 

+--- ioapi.h.orig	2014-05-24 09:54:26.302884145 +0200
++++ ioapi.h	2014-05-24 09:47:36.375502868 +0200
+@@ -135,6 +135,7 @@
+ 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 *close_file_func)     OF((voidpf opaque, voidpf stream));
+ typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+ 
+@@ -186,6 +187,7 @@
+ 
+ #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 ZFLUSH(filefunc,filestream)               ((*((filefunc).zflush_file))               ((filefunc).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))