diff --git a/third-party/11zip/extlibs/minizip/include/minizip/gzguts.h b/third-party/11zip/extlibs/minizip/include/minizip/gzguts.h index b838c41298..37351aefa7 100644 --- a/third-party/11zip/extlibs/minizip/include/minizip/gzguts.h +++ b/third-party/11zip/extlibs/minizip/include/minizip/gzguts.h @@ -166,6 +166,10 @@ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); #define COPY 1 /* copy input directly */ #define GZIP 2 /* decompress a gzip stream */ +#ifdef __unix__ +#include +#endif + /* internal gzip file state data structure */ typedef struct { diff --git a/third-party/11zip/extlibs/minizip/src/miniunz.c b/third-party/11zip/extlibs/minizip/src/miniunz.c index d60712b74d..a2c01dcd9c 100644 --- a/third-party/11zip/extlibs/minizip/src/miniunz.c +++ b/third-party/11zip/extlibs/minizip/src/miniunz.c @@ -52,6 +52,7 @@ #else # include # include +#include #endif @@ -99,7 +100,7 @@ tm_unz tmu_date; SetFileTime(hFile, &ftm, &ftLastAcc, &ftm); CloseHandle(hFile); #else -#ifdef unix || __APPLE__ +#if defined unix || defined __APPLE__ struct utimbuf ut; struct tm newdate; newdate.tm_sec = tmu_date.tm_sec; diff --git a/third-party/11zip/extlibs/minizip/src/minizip.c b/third-party/11zip/extlibs/minizip/src/minizip.c index aad8fd85d4..704c53722b 100644 --- a/third-party/11zip/extlibs/minizip/src/minizip.c +++ b/third-party/11zip/extlibs/minizip/src/minizip.c @@ -92,7 +92,7 @@ uLong* dt; /* dostime */ return ret; } #else -#ifdef unix || __APPLE__ +#if defined unix || defined __APPLE__ uLong filetime(f, tmzip, dt) char *f; /* name of file to get info on */ tm_zip *tmzip; /* return value: access, modific. and creation times */ diff --git a/third-party/11zip/src/zipper.cpp b/third-party/11zip/src/zipper.cpp index f55bf89578..ffdb645358 100644 --- a/third-party/11zip/src/zipper.cpp +++ b/third-party/11zip/src/zipper.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include @@ -74,7 +75,8 @@ namespace ziputils } //?? we dont need the stinking time - zip_fileinfo zi = {0}; + zip_fileinfo zi; + memset(&zi, 0, sizeof(zi)); getTime(zi.tmz_date); int err = zipOpenNewFileInZip(zipFile_, filename, &zi, @@ -109,7 +111,6 @@ namespace ziputils { int err = ZIP_OK; char buf[BUFSIZE]; - unsigned long nRead = 0; if (isOpenEntry()) {