|
18 | 18 |
|
19 | 19 | */ |
20 | 20 |
|
21 | | -#ifndef _ZLIBIOAPI64_H |
22 | | -#define _ZLIBIOAPI64_H |
| 21 | +#ifndef ZLIBIOAPI64_H |
| 22 | +#define ZLIBIOAPI64_H |
23 | 23 |
|
24 | 24 | #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) |
25 | 25 |
|
26 | | - // Linux needs this to support file operation on files larger then 4+GB |
27 | | - // But might need better if/def to select just the platforms that needs them. |
| 26 | + /* Linux needs this to support file operation on files larger then 4+GB */ |
| 27 | + /* But might need better if/def to select just the platforms that needs them.*/ |
28 | 28 |
|
29 | 29 | #ifndef __USE_FILE_OFFSET64 |
30 | 30 | #define __USE_FILE_OFFSET64 |
|
67 | 67 | #endif |
68 | 68 | #endif |
69 | 69 |
|
70 | | -/* |
71 | | -#ifndef ZPOS64_T |
72 | | - #ifdef _WIN32 |
73 | | - #define ZPOS64_T fpos_t |
74 | | - #else |
75 | | - #include <stdint.h> |
76 | | - #define ZPOS64_T uint64_t |
77 | | - #endif |
78 | | -#endif |
79 | | -*/ |
80 | | - |
81 | 70 | #ifdef HAVE_MINIZIP64_CONF_H |
82 | 71 | #include "mz64conf.h" |
83 | 72 | #endif |
84 | 73 |
|
85 | | -/* a type chosen by DEFINE */ |
86 | | -#ifdef HAVE_64BIT_INT_CUSTOM |
87 | | -typedef 64BIT_INT_CUSTOM_TYPE ZPOS64_T; |
88 | | -#else |
89 | | -#ifdef HAS_STDINT_H |
90 | | -#include "stdint.h" |
91 | | -typedef uint64_t ZPOS64_T; |
92 | | -#else |
93 | | - |
94 | | - |
95 | | - |
96 | | -#if defined(_MSC_VER) || defined(__BORLANDC__) |
97 | | -typedef unsigned __int64 ZPOS64_T; |
98 | | -#else |
99 | | -typedef unsigned long long int ZPOS64_T; |
100 | | -#endif |
101 | | -#endif |
102 | | -#endif |
| 74 | +#include "ints.h" |
| 75 | +typedef ui64_t ZPOS64_T; |
103 | 76 |
|
104 | 77 | /* Maximum unsigned 32-bit value used as placeholder for zip64 */ |
105 | 78 | #ifndef MAXU32 |
@@ -188,8 +161,8 @@ typedef struct zlib_filefunc64_32_def_s |
188 | 161 |
|
189 | 162 | #define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) |
190 | 163 | #define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) |
191 | | -//#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream)) |
192 | | -//#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode)) |
| 164 | +/*#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream)) */ |
| 165 | +/*#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode)) */ |
193 | 166 | #define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream)) |
194 | 167 | #define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream)) |
195 | 168 |
|
|
0 commit comments