diff options
Diffstat (limited to 'contrib/minizip/ioapi.h')
-rw-r--r-- | contrib/minizip/ioapi.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h index ae9ca7e..f6cc81b 100644 --- a/contrib/minizip/ioapi.h +++ b/contrib/minizip/ioapi.h | |||
@@ -134,14 +134,14 @@ extern "C" { | |||
134 | 134 | ||
135 | 135 | ||
136 | 136 | ||
137 | typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); | 137 | typedef voidpf (ZCALLBACK *open_file_func) (voidpf opaque, const char* filename, int mode); |
138 | typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); | 138 | typedef uLong (ZCALLBACK *read_file_func) (voidpf opaque, voidpf stream, void* buf, uLong size); |
139 | typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); | 139 | typedef uLong (ZCALLBACK *write_file_func) (voidpf opaque, voidpf stream, const void* buf, uLong size); |
140 | typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream)); | 140 | typedef int (ZCALLBACK *close_file_func) (voidpf opaque, voidpf stream); |
141 | typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream)); | 141 | typedef int (ZCALLBACK *testerror_file_func) (voidpf opaque, voidpf stream); |
142 | 142 | ||
143 | typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream)); | 143 | typedef long (ZCALLBACK *tell_file_func) (voidpf opaque, voidpf stream); |
144 | typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin)); | 144 | typedef long (ZCALLBACK *seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin); |
145 | 145 | ||
146 | 146 | ||
147 | /* here is the "old" 32 bits structure structure */ | 147 | /* here is the "old" 32 bits structure structure */ |
@@ -157,9 +157,9 @@ typedef struct zlib_filefunc_def_s | |||
157 | voidpf opaque; | 157 | voidpf opaque; |
158 | } zlib_filefunc_def; | 158 | } zlib_filefunc_def; |
159 | 159 | ||
160 | typedef ZPOS64_T (ZCALLBACK *tell64_file_func) OF((voidpf opaque, voidpf stream)); | 160 | typedef ZPOS64_T (ZCALLBACK *tell64_file_func) (voidpf opaque, voidpf stream); |
161 | typedef long (ZCALLBACK *seek64_file_func) OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)); | 161 | typedef long (ZCALLBACK *seek64_file_func) (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin); |
162 | typedef voidpf (ZCALLBACK *open64_file_func) OF((voidpf opaque, const void* filename, int mode)); | 162 | typedef voidpf (ZCALLBACK *open64_file_func) (voidpf opaque, const void* filename, int mode); |
163 | 163 | ||
164 | typedef struct zlib_filefunc64_def_s | 164 | typedef struct zlib_filefunc64_def_s |
165 | { | 165 | { |
@@ -173,8 +173,8 @@ typedef struct zlib_filefunc64_def_s | |||
173 | voidpf opaque; | 173 | voidpf opaque; |
174 | } zlib_filefunc64_def; | 174 | } zlib_filefunc64_def; |
175 | 175 | ||
176 | void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def)); | 176 | void fill_fopen64_filefunc(zlib_filefunc64_def* pzlib_filefunc_def); |
177 | void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); | 177 | void fill_fopen_filefunc(zlib_filefunc_def* pzlib_filefunc_def); |
178 | 178 | ||
179 | /* now internal definition, only for zip.c and unzip.h */ | 179 | /* now internal definition, only for zip.c and unzip.h */ |
180 | typedef struct zlib_filefunc64_32_def_s | 180 | typedef struct zlib_filefunc64_32_def_s |
@@ -193,11 +193,11 @@ typedef struct zlib_filefunc64_32_def_s | |||
193 | #define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream)) | 193 | #define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream)) |
194 | #define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream)) | 194 | #define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream)) |
195 | 195 | ||
196 | voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)); | 196 | voidpf call_zopen64(const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode); |
197 | long call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)); | 197 | long call_zseek64(const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin); |
198 | ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)); | 198 | ZPOS64_T call_ztell64(const zlib_filefunc64_32_def* pfilefunc,voidpf filestream); |
199 | 199 | ||
200 | void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32); | 200 | void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32); |
201 | 201 | ||
202 | #define ZOPEN64(filefunc,filename,mode) (call_zopen64((&(filefunc)),(filename),(mode))) | 202 | #define ZOPEN64(filefunc,filename,mode) (call_zopen64((&(filefunc)),(filename),(mode))) |
203 | #define ZTELL64(filefunc,filestream) (call_ztell64((&(filefunc)),(filestream))) | 203 | #define ZTELL64(filefunc,filestream) (call_ztell64((&(filefunc)),(filestream))) |