summaryrefslogtreecommitdiff
path: root/contrib/minizip
diff options
context:
space:
mode:
authorWez <wez@chromium.org>2018-07-18 00:24:45 +0000
committerCommit Bot <commit-bot@chromium.org>2018-07-18 00:24:45 +0000
commitae8f124d00c0d7cc16a4f2c4cfa23946df0643d9 (patch)
treebfef5981e9ece9902542b7818aff57e5e7982848 /contrib/minizip
parent39b4a6260702da4c089eca57136abf40a39667e9 (diff)
downloadzlib-ae8f124d00c0d7cc16a4f2c4cfa23946df0643d9.tar.gz
Roll Fuchsia SDK from 99f42fc7925d to e237df60615b
The AutoRoll server is located here: https://fuchsia-sdk-chromium-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=luci.chromium.try:fuchsia_arm64_cast_audio;luci.chromium.try:fuchsia_x64_cast_audio Change-Id: I0ff88b708c490cc760902e245e6473e90546c4b9 Reviewed-on: https://chromium-review.googlesource.com/1137750 Reviewed-by: Daniel Cheng <dcheng@chromium.org> Reviewed-by: Leon Scroggins <scroggo@chromium.org> Reviewed-by: Wez <wez@chromium.org> Reviewed-by: Fuchsia SDK Autoroller <fuchsia-sdk-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: Wez <wez@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#575870} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: cf06d0263c89f4c2e8d89cc34e31d535ca90a22b
Diffstat (limited to 'contrib/minizip')
-rw-r--r--contrib/minizip/ioapi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c
index 7f5c191..543910b 100644
--- a/contrib/minizip/ioapi.c
+++ b/contrib/minizip/ioapi.c
@@ -14,7 +14,7 @@
#define _CRT_SECURE_NO_WARNINGS
#endif
-#if defined(__APPLE__) || defined(IOAPI_NO_64)
+#if defined(__APPLE__) || defined(__Fuchsia__) || defined(IOAPI_NO_64)
// 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)