diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2022-01-01 14:32:17 -0800 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2022-01-01 14:55:47 -0800 |
commit | 2014a993addbc8f1b9785d97f55fd189792c2f78 (patch) | |
tree | 9a90875e93972077d00a434c69a045585dbcb9bc /contrib/minizip/zip.h | |
parent | 58ca4e57ce7d76734d8b5afa03d205f694419b17 (diff) | |
download | zlib-2014a993addbc8f1b9785d97f55fd189792c2f78.tar.gz zlib-2014a993addbc8f1b9785d97f55fd189792c2f78.tar.bz2 zlib-2014a993addbc8f1b9785d97f55fd189792c2f78.zip |
Clean up minizip to reduce warnings for testing.
Also fix Makefile test target and permit added compile options.
Diffstat (limited to 'contrib/minizip/zip.h')
-rw-r--r-- | contrib/minizip/zip.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h index 8aaebb6..7e4509d 100644 --- a/contrib/minizip/zip.h +++ b/contrib/minizip/zip.h | |||
@@ -88,12 +88,12 @@ typedef voidp zipFile; | |||
88 | /* tm_zip contain date/time info */ | 88 | /* tm_zip contain date/time info */ |
89 | typedef struct tm_zip_s | 89 | typedef struct tm_zip_s |
90 | { | 90 | { |
91 | uInt tm_sec; /* seconds after the minute - [0,59] */ | 91 | int tm_sec; /* seconds after the minute - [0,59] */ |
92 | uInt tm_min; /* minutes after the hour - [0,59] */ | 92 | int tm_min; /* minutes after the hour - [0,59] */ |
93 | uInt tm_hour; /* hours since midnight - [0,23] */ | 93 | int tm_hour; /* hours since midnight - [0,23] */ |
94 | uInt tm_mday; /* day of the month - [1,31] */ | 94 | int tm_mday; /* day of the month - [1,31] */ |
95 | uInt tm_mon; /* months since January - [0,11] */ | 95 | int tm_mon; /* months since January - [0,11] */ |
96 | uInt tm_year; /* years - [1980..2044] */ | 96 | int tm_year; /* years - [1980..2044] */ |
97 | } tm_zip; | 97 | } tm_zip; |
98 | 98 | ||
99 | typedef struct | 99 | typedef struct |
@@ -144,6 +144,11 @@ extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname, | |||
144 | zipcharpc* globalcomment, | 144 | zipcharpc* globalcomment, |
145 | zlib_filefunc64_def* pzlib_filefunc_def)); | 145 | zlib_filefunc64_def* pzlib_filefunc_def)); |
146 | 146 | ||
147 | extern zipFile ZEXPORT zipOpen3 OF((const void *pathname, | ||
148 | int append, | ||
149 | zipcharpc* globalcomment, | ||
150 | zlib_filefunc64_32_def* pzlib_filefunc64_32_def)); | ||
151 | |||
147 | extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file, | 152 | extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file, |
148 | const char* filename, | 153 | const char* filename, |
149 | const zip_fileinfo* zipfi, | 154 | const zip_fileinfo* zipfi, |