Skip to content

Bugfix/159 #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BrandonSmith wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bugfix/159 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cd6dc8
rename zip.h
Jan 17, 2019
74bd410
Fix module map
ecexplorer Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Zip.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -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 */; };
Expand All @@ -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 */; };
Expand Down Expand Up @@ -80,8 +80,8 @@
342FC0EA1C5044DC0023A3C3 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
342FC0EB1C5044DC0023A3C3 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = "<group>"; };
342FC0EC1C5044DC0023A3C3 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
342FC0ED1C5044DC0023A3C3 /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = "<group>"; };
342FC0EE1C5044DC0023A3C3 /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = "<group>"; };
342FC0ED1C5044DC0023A3C3 /* mz_zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mz_zip.c; sourceTree = "<group>"; };
342FC0EE1C5044DC0023A3C3 /* mz_zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mz_zip.h; sourceTree = "<group>"; };
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 = "<group>"; };
343F50FF1C8DAEEC0028C434 /* Zip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Zip.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -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 = "<group>";
Expand Down Expand Up @@ -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 */,
Expand All @@ -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;
Expand All @@ -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 */,
Expand Down Expand Up @@ -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;
Expand All @@ -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 */,
);
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Zip/minizip/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Minizip [system][extern_c] {
header "unzip.h"
header "zip.h"
header "mz_zip.h"
export *
}
4 changes: 2 additions & 2 deletions Zip/minizip/zip.c → Zip/minizip/mz_zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -19,7 +19,7 @@
#include <string.h>
#include <time.h>
#include "zlib.h"
#include "zip.h"
#include "mz_zip.h"

#ifdef STDC
# include <stddef.h>
Expand Down
6 changes: 3 additions & 3 deletions Zip/minizip/zip.h → Zip/minizip/mz_zip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -195,4 +195,4 @@ extern int ZEXPORT zipClose OF((zipFile file, const char* global_comment));
}
#endif

#endif /* _ZIP_H */
#endif /* _MZ_ZIP_H */