mirror of https://github.com/microsoft/vcpkg.git
85 lines
2.2 KiB
Diff
85 lines
2.2 KiB
Diff
diff --git a/ThirdParty/Minizip/minizip/miniunz.c b/ThirdParty/Minizip/minizip/miniunz.c
|
|
index 1931161..4ec0fe1 100644
|
|
--- a/ThirdParty/Minizip/minizip/miniunz.c
|
|
+++ b/ThirdParty/Minizip/minizip/miniunz.c
|
|
@@ -45,6 +45,7 @@
|
|
#include <time.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
+#include <sys/stat.h>
|
|
#include <stdarg.h>
|
|
|
|
#ifdef _WIN32
|
|
@@ -56,7 +57,7 @@
|
|
#endif
|
|
|
|
|
|
-#include "unzip.h"
|
|
+#include <minizip/unzip.h>
|
|
|
|
#define CASESENSITIVITY (0)
|
|
#define WRITEBUFFERSIZE (8192)
|
|
@@ -64,7 +65,7 @@
|
|
|
|
#ifdef _WIN32
|
|
#define USEWIN32IOAPI
|
|
-#include "iowin32.h"
|
|
+#include <minizip/iowin32.h>
|
|
#endif
|
|
|
|
|
|
@@ -107,7 +108,7 @@ void change_file_date(filename,dosdate,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;
|
|
@@ -137,7 +138,7 @@ int mymkdir(dirname)
|
|
int ret=0;
|
|
#ifdef _WIN32
|
|
ret = _mkdir(dirname);
|
|
-#elif unix
|
|
+#elif 1
|
|
ret = mkdir (dirname,0775);
|
|
#elif __APPLE__
|
|
ret = mkdir (dirname,0775);
|
|
diff --git a/ThirdParty/Minizip/minizip/minizip.c b/ThirdParty/Minizip/minizip/minizip.c
|
|
index e22f80d..97e16e5 100644
|
|
--- a/ThirdParty/Minizip/minizip/minizip.c
|
|
+++ b/ThirdParty/Minizip/minizip/minizip.c
|
|
@@ -59,11 +59,11 @@
|
|
# include <sys/stat.h>
|
|
#endif
|
|
|
|
-#include "zip.h"
|
|
+#include <minizip/zip.h>
|
|
|
|
#ifdef _WIN32
|
|
#define USEWIN32IOAPI
|
|
- #include "iowin32.h"
|
|
+ #include <minizip/iowin32.h>
|
|
#endif
|
|
|
|
|
|
@@ -101,7 +101,7 @@ uLong filetime(f, tmzip, dt)
|
|
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 */
|
|
@@ -453,7 +453,7 @@ int minizip(argc,argv)
|
|
}
|
|
if( lastslash != NULL )
|
|
{
|
|
- savefilenameinzip = lastslash+1; // base filename follows last slash.
|
|
+ savefilenameinzip = lastslash+1; /* base filename follows last slash. */
|
|
}
|
|
}
|
|
|