summaryrefslogtreecommitdiff
path: root/src/minizip/zip.c.diff
diff options
context:
space:
mode:
authorXavier Roche <xroche@users.noreply.github.com>2014-05-24 07:56:11 +0000
committerXavier Roche <xroche@users.noreply.github.com>2014-05-24 07:56:11 +0000
commit882578ed9a39a03d7f08183fdec12dce7da00588 (patch)
treec642884dad62d62159d7a507586bfe851c9e1a69 /src/minizip/zip.c.diff
parent1ec8b5fb9e57025da7bd88b648b2f9ed19f70510 (diff)
Upgraded to minizip 1.1 from zlib 1.2.8
Diffstat (limited to 'src/minizip/zip.c.diff')
-rw-r--r--src/minizip/zip.c.diff34
1 files changed, 11 insertions, 23 deletions
diff --git a/src/minizip/zip.c.diff b/src/minizip/zip.c.diff
index 10ea3ca..423816f 100644
--- a/src/minizip/zip.c.diff
+++ b/src/minizip/zip.c.diff
@@ -1,26 +1,10 @@
---- zip.c.orig 2014-05-23 15:29:40.975965289 +0200
-+++ zip.c 2014-05-23 15:29:40.975965289 +0200
-@@ -7,8 +7,13 @@
- */
-
-
-+#ifndef _WIN32_WCE
- #include <stdio.h>
- #include <stdlib.h>
-+#else
-+#include <stdio.h>
-+#include "celib.h"
-+#endif
- #include <string.h>
- #include <time.h>
- #include "zlib.h"
-@@ -1178,3 +1183,17 @@
-
- return err;
- }
-+
-+extern int ZEXPORT zipFlush (file)
-+ zipFile file;
+--- zip.c.orig 2014-05-24 09:54:26.314883072 +0200
++++ zip.c 2014-05-24 09:52:59.338410979 +0200
+@@ -1879,6 +1879,19 @@
+ return err;
+ }
+
++extern int ZEXPORT zipFlush (zipFile file)
+{
+ zip_internal* zi;
+ if (file == NULL)
@@ -32,3 +16,7 @@
+ else
+ return EOF;
+}
++
+ extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
+ {
+ zip64_internal* zi;