5e6092bc11
PR-URL: https://github.com/nodejs/node/pull/56655 Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
83 lines
3.7 KiB
Diff
83 lines
3.7 KiB
Diff
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 616c30325e07c..f4ad16bdd377b 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
|
|
|
|
-#if defined(__APPLE__) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64)
|
|
+#if defined(__APPLE__) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) || 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)
|
|
@@ -97,7 +97,7 @@ static void change_file_date(const char *filename, uLong dosdate, tm_unz tmu_dat
|
|
LocalFileTimeToFileTime(&ftLocal,&ftm);
|
|
SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
|
|
CloseHandle(hFile);
|
|
-#elif defined(__unix__) || defined(__unix) || defined(__APPLE__)
|
|
+#elif defined(__unix__) || defined(__unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
|
|
(void)dosdate;
|
|
struct utimbuf ut;
|
|
struct tm newdate;
|
|
@@ -129,7 +129,7 @@ static int mymkdir(const char* dirname) {
|
|
int ret=0;
|
|
#ifdef _WIN32
|
|
ret = _mkdir(dirname);
|
|
-#elif defined(__unix__) || defined(__unix) || defined(__APPLE__)
|
|
+#elif defined(__unix__) || defined(__unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
|
|
ret = mkdir (dirname,0775);
|
|
#else
|
|
(void)dirname;
|
|
diff --git a/third_party/zlib/contrib/minizip/minizip.c b/third_party/zlib/contrib/minizip/minizip.c
|
|
index a44e36a01869d..53fdd363e6222 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
|
|
|
|
-#if defined(__APPLE__) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64)
|
|
+#if defined(__APPLE__) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) || 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)
|
|
@@ -96,7 +95,7 @@ static int filetime(const char *f, tm_zip *tmzip, uLong *dt) {
|
|
}
|
|
return ret;
|
|
}
|
|
-#elif defined(__unix__) || defined(__unix) || defined(__APPLE__)
|
|
+#elif defined(__unix__) || defined(__unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
|
|
/* f: name of file to get info on, tmzip: return value: access,
|
|
modification and creation times, dt: dostime */
|
|
static int filetime(const char *f, tm_zip *tmzip, uLong *dt) {
|