From 5cd6dc857231a741cb5e2cf622de0ce19df08993 Mon Sep 17 00:00:00 2001 From: Matthew Wood Date: Thu, 17 Jan 2019 15:36:42 -0500 Subject: [PATCH 1/2] rename zip.h --- Zip.xcodeproj/project.pbxproj | 32 ++++++++++++++++---------------- Zip/minizip/{zip.c => mz_zip.c} | 4 ++-- Zip/minizip/{zip.h => mz_zip.h} | 6 +++--- 3 files changed, 21 insertions(+), 21 deletions(-) rename Zip/minizip/{zip.c => mz_zip.c} (99%) rename Zip/minizip/{zip.h => mz_zip.h} (99%) diff --git a/Zip.xcodeproj/project.pbxproj b/Zip.xcodeproj/project.pbxproj index 5e602baf..69a93079 100644 --- a/Zip.xcodeproj/project.pbxproj +++ b/Zip.xcodeproj/project.pbxproj @@ -13,10 +13,10 @@ 342545921CE525B200336074 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 342FC0EB1C5044DC0023A3C3 /* unzip.c */; }; 342545941CE525B200336074 /* QuickZip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3443A3F51C4AB8A3004AD173 /* QuickZip.swift */; }; 342545951CE525B200336074 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 342FC0E81C5044DC0023A3C3 /* ioapi.c */; }; - 342545991CE525B200336074 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 342FC0ED1C5044DC0023A3C3 /* zip.c */; }; + 342545991CE525B200336074 /* mz_zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 342FC0ED1C5044DC0023A3C3 /* mz_zip.c */; }; 3425459A1CE525B200336074 /* ZipUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 343625BA1C5827DC0023C4C6 /* ZipUtilities.swift */; }; 3425459E1CE525B200336074 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3430F61F1C45C805007473A6 /* libz.tbd */; }; - 342545A11CE525B200336074 /* zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0EE1C5044DC0023A3C3 /* zip.h */; }; + 342545A11CE525B200336074 /* mz_zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0EE1C5044DC0023A3C3 /* mz_zip.h */; }; 342545A41CE525B200336074 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0EC1C5044DC0023A3C3 /* unzip.h */; }; 342545A71CE525B200336074 /* crypt.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0E71C5044DC0023A3C3 /* crypt.h */; }; 342545AB1CE525B200336074 /* ioapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0E91C5044DC0023A3C3 /* ioapi.h */; }; @@ -26,8 +26,8 @@ 342FC1061C5044DC0023A3C3 /* ioapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0E91C5044DC0023A3C3 /* ioapi.h */; }; 342FC1071C5044DC0023A3C3 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 342FC0EB1C5044DC0023A3C3 /* unzip.c */; }; 342FC1081C5044DC0023A3C3 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0EC1C5044DC0023A3C3 /* unzip.h */; }; - 342FC1091C5044DC0023A3C3 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 342FC0ED1C5044DC0023A3C3 /* zip.c */; }; - 342FC10A1C5044DC0023A3C3 /* zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0EE1C5044DC0023A3C3 /* zip.h */; }; + 342FC1091C5044DC0023A3C3 /* mz_zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 342FC0ED1C5044DC0023A3C3 /* mz_zip.c */; }; + 342FC10A1C5044DC0023A3C3 /* mz_zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0EE1C5044DC0023A3C3 /* mz_zip.h */; }; 3430F6201C45C805007473A6 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3430F61F1C45C805007473A6 /* libz.tbd */; }; 343625BB1C5827DC0023C4C6 /* ZipUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 343625BA1C5827DC0023C4C6 /* ZipUtilities.swift */; }; 343F51091C8DAEEC0028C434 /* Zip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 343F50FF1C8DAEEC0028C434 /* Zip.framework */; }; @@ -39,8 +39,8 @@ 343F511B1C8DAFDB0028C434 /* ioapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0E91C5044DC0023A3C3 /* ioapi.h */; }; 343F511C1C8DAFE00028C434 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 342FC0EB1C5044DC0023A3C3 /* unzip.c */; }; 343F511D1C8DAFE30028C434 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0EC1C5044DC0023A3C3 /* unzip.h */; }; - 343F511E1C8DAFE50028C434 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 342FC0ED1C5044DC0023A3C3 /* zip.c */; }; - 343F511F1C8DAFE80028C434 /* zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0EE1C5044DC0023A3C3 /* zip.h */; }; + 343F511E1C8DAFE50028C434 /* mz_zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 342FC0ED1C5044DC0023A3C3 /* mz_zip.c */; }; + 343F511F1C8DAFE80028C434 /* mz_zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 342FC0EE1C5044DC0023A3C3 /* mz_zip.h */; }; 343F51351C8DB0480028C434 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3430F61F1C45C805007473A6 /* libz.tbd */; }; 343F51361C8DB0720028C434 /* Zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 347E3A771C1DFFB500A11FD3 /* Zip.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3443A3F61C4AB8A3004AD173 /* QuickZip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3443A3F51C4AB8A3004AD173 /* QuickZip.swift */; }; @@ -80,8 +80,8 @@ 342FC0EA1C5044DC0023A3C3 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; 342FC0EB1C5044DC0023A3C3 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = ""; }; 342FC0EC1C5044DC0023A3C3 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = ""; }; - 342FC0ED1C5044DC0023A3C3 /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = ""; }; - 342FC0EE1C5044DC0023A3C3 /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = ""; }; + 342FC0ED1C5044DC0023A3C3 /* mz_zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mz_zip.c; sourceTree = ""; }; + 342FC0EE1C5044DC0023A3C3 /* mz_zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mz_zip.h; sourceTree = ""; }; 3430F61F1C45C805007473A6 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 343625BA1C5827DC0023C4C6 /* ZipUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZipUtilities.swift; sourceTree = ""; }; 343F50FF1C8DAEEC0028C434 /* Zip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Zip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -153,8 +153,8 @@ 342FC0EA1C5044DC0023A3C3 /* module.modulemap */, 342FC0EB1C5044DC0023A3C3 /* unzip.c */, 342FC0EC1C5044DC0023A3C3 /* unzip.h */, - 342FC0ED1C5044DC0023A3C3 /* zip.c */, - 342FC0EE1C5044DC0023A3C3 /* zip.h */, + 342FC0ED1C5044DC0023A3C3 /* mz_zip.c */, + 342FC0EE1C5044DC0023A3C3 /* mz_zip.h */, ); path = minizip; sourceTree = ""; @@ -216,7 +216,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 342545A11CE525B200336074 /* zip.h in Headers */, + 342545A11CE525B200336074 /* mz_zip.h in Headers */, 342545A41CE525B200336074 /* unzip.h in Headers */, 342545A71CE525B200336074 /* crypt.h in Headers */, 342545AB1CE525B200336074 /* ioapi.h in Headers */, @@ -231,7 +231,7 @@ 343F51361C8DB0720028C434 /* Zip.h in Headers */, 343F511B1C8DAFDB0028C434 /* ioapi.h in Headers */, 343F51191C8DAFD50028C434 /* crypt.h in Headers */, - 343F511F1C8DAFE80028C434 /* zip.h in Headers */, + 343F511F1C8DAFE80028C434 /* mz_zip.h in Headers */, 343F511D1C8DAFE30028C434 /* unzip.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -240,7 +240,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 342FC10A1C5044DC0023A3C3 /* zip.h in Headers */, + 342FC10A1C5044DC0023A3C3 /* mz_zip.h in Headers */, 342FC1081C5044DC0023A3C3 /* unzip.h in Headers */, 342FC1041C5044DC0023A3C3 /* crypt.h in Headers */, 342FC1061C5044DC0023A3C3 /* ioapi.h in Headers */, @@ -440,7 +440,7 @@ 342545921CE525B200336074 /* unzip.c in Sources */, 342545941CE525B200336074 /* QuickZip.swift in Sources */, 342545951CE525B200336074 /* ioapi.c in Sources */, - 342545991CE525B200336074 /* zip.c in Sources */, + 342545991CE525B200336074 /* mz_zip.c in Sources */, 3425459A1CE525B200336074 /* ZipUtilities.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -452,7 +452,7 @@ 343F51161C8DAF3F0028C434 /* ZipUtilities.swift in Sources */, 343F511C1C8DAFE00028C434 /* unzip.c in Sources */, 343F51171C8DAF410028C434 /* QuickZip.swift in Sources */, - 343F511E1C8DAFE50028C434 /* zip.c in Sources */, + 343F511E1C8DAFE50028C434 /* mz_zip.c in Sources */, 343F511A1C8DAFD90028C434 /* ioapi.c in Sources */, 343F51181C8DAF450028C434 /* Zip.swift in Sources */, ); @@ -473,7 +473,7 @@ 342FC1071C5044DC0023A3C3 /* unzip.c in Sources */, 3443A3F61C4AB8A3004AD173 /* QuickZip.swift in Sources */, 342FC1051C5044DC0023A3C3 /* ioapi.c in Sources */, - 342FC1091C5044DC0023A3C3 /* zip.c in Sources */, + 342FC1091C5044DC0023A3C3 /* mz_zip.c in Sources */, 343625BB1C5827DC0023C4C6 /* ZipUtilities.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Zip/minizip/zip.c b/Zip/minizip/mz_zip.c similarity index 99% rename from Zip/minizip/zip.c rename to Zip/minizip/mz_zip.c index 366ac908..d74a39da 100755 --- a/Zip/minizip/zip.c +++ b/Zip/minizip/mz_zip.c @@ -1,4 +1,4 @@ -/* zip.c -- IO on .zip files using zlib +/* mz_zip.c -- IO on .zip files using zlib Version 1.1, February 14h, 2010 part of the MiniZip project @@ -19,7 +19,7 @@ #include #include #include "zlib.h" -#include "zip.h" +#include "mz_zip.h" #ifdef STDC # include diff --git a/Zip/minizip/zip.h b/Zip/minizip/mz_zip.h similarity index 99% rename from Zip/minizip/zip.h rename to Zip/minizip/mz_zip.h index 60208a35..61ff3a47 100644 --- a/Zip/minizip/zip.h +++ b/Zip/minizip/mz_zip.h @@ -12,8 +12,8 @@ See the accompanying LICENSE file for the full text of the license. */ -#ifndef _ZIP_H -#define _ZIP_H +#ifndef _MZ_ZIP_H +#define _MZ_ZIP_H #ifdef __cplusplus extern "C" { @@ -195,4 +195,4 @@ extern int ZEXPORT zipClose OF((zipFile file, const char* global_comment)); } #endif -#endif /* _ZIP_H */ +#endif /* _MZ_ZIP_H */ From 74bd410d8360966c0c16cef9c5bba50dc597a014 Mon Sep 17 00:00:00 2001 From: Matthew Wood Date: Thu, 17 Jan 2019 15:46:14 -0500 Subject: [PATCH 2/2] Fix module map --- Zip/minizip/module.modulemap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zip/minizip/module.modulemap b/Zip/minizip/module.modulemap index 9f6ace22..f1f9fda3 100644 --- a/Zip/minizip/module.modulemap +++ b/Zip/minizip/module.modulemap @@ -1,5 +1,5 @@ module Minizip [system][extern_c] { header "unzip.h" - header "zip.h" + header "mz_zip.h" export * }