You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
99 lines
3.5 KiB
99 lines
3.5 KiB
From 0c7de17000659f4f79de878296892c46be0aff77 Mon Sep 17 00:00:00 2001
|
|
From: Noel Gordon <noel@chromium.org>
|
|
Date: Wed, 26 May 2021 21:57:43 +1000
|
|
Subject: [PATCH] Build minizip zip and unzip tools
|
|
|
|
---
|
|
third_party/zlib/contrib/minizip/miniunz.c | 13 ++++++-------
|
|
third_party/zlib/contrib/minizip/minizip.c | 7 +++----
|
|
2 files changed, 9 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/third_party/zlib/contrib/minizip/miniunz.c b/third_party/zlib/contrib/minizip/miniunz.c
|
|
index 3d65401be5cd..08737f689a96 100644
|
|
--- a/third_party/zlib/contrib/minizip/miniunz.c
|
|
+++ b/third_party/zlib/contrib/minizip/miniunz.c
|
|
@@ -12,7 +12,7 @@
|
|
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
|
*/
|
|
|
|
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
|
|
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID_API__))
|
|
#ifndef __USE_FILE_OFFSET64
|
|
#define __USE_FILE_OFFSET64
|
|
#endif
|
|
@@ -27,7 +27,7 @@
|
|
#endif
|
|
#endif
|
|
|
|
-#ifdef __APPLE__
|
|
+#if defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
|
|
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
|
|
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
|
|
#define FTELLO_FUNC(stream) ftello(stream)
|
|
@@ -45,6 +45,7 @@
|
|
#include <time.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
+#include <sys/stat.h>
|
|
|
|
#ifdef _WIN32
|
|
# include <direct.h>
|
|
@@ -97,7 +98,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__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
|
|
struct utimbuf ut;
|
|
struct tm newdate;
|
|
newdate.tm_sec = tmu_date.tm_sec;
|
|
@@ -125,11 +126,9 @@ int mymkdir(dirname)
|
|
const char* dirname;
|
|
{
|
|
int ret=0;
|
|
-#ifdef _WIN32
|
|
+#if defined(_WIN32)
|
|
ret = _mkdir(dirname);
|
|
-#elif unix
|
|
- ret = mkdir (dirname,0775);
|
|
-#elif __APPLE__
|
|
+#elif defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
|
|
ret = mkdir (dirname,0775);
|
|
#endif
|
|
return ret;
|
|
diff --git a/third_party/zlib/contrib/minizip/minizip.c b/third_party/zlib/contrib/minizip/minizip.c
|
|
index 4288962ecef0..b794953c5c23 100644
|
|
--- a/third_party/zlib/contrib/minizip/minizip.c
|
|
+++ b/third_party/zlib/contrib/minizip/minizip.c
|
|
@@ -12,8 +12,7 @@
|
|
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
|
*/
|
|
|
|
-
|
|
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
|
|
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID_API__))
|
|
#ifndef __USE_FILE_OFFSET64
|
|
#define __USE_FILE_OFFSET64
|
|
#endif
|
|
@@ -28,7 +27,7 @@
|
|
#endif
|
|
#endif
|
|
|
|
-#ifdef __APPLE__
|
|
+#if defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
|
|
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
|
|
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
|
|
#define FTELLO_FUNC(stream) ftello(stream)
|
|
@@ -94,7 +93,7 @@ uLong filetime(f, tmzip, dt)
|
|
return ret;
|
|
}
|
|
#else
|
|
-#ifdef unix || __APPLE__
|
|
+#if defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
|
|
uLong filetime(f, tmzip, dt)
|
|
char *f; /* name of file to get info on */
|
|
tm_zip *tmzip; /* return value: access, modific. and creation times */
|
|
--
|
|
2.31.1.818.g46aad6cb9e-goog
|
|
|