diff options
Diffstat (limited to 'contrib/minizip/ioapi.h')
-rw-r--r-- | contrib/minizip/ioapi.h | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h index a2d2e6e..da1b72f 100644 --- a/contrib/minizip/ioapi.h +++ b/contrib/minizip/ioapi.h | |||
@@ -67,39 +67,12 @@ | |||
67 | #endif | 67 | #endif |
68 | #endif | 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 | #ifdef HAVE_MINIZIP64_CONF_H | 70 | #ifdef HAVE_MINIZIP64_CONF_H |
82 | #include "mz64conf.h" | 71 | #include "mz64conf.h" |
83 | #endif | 72 | #endif |
84 | 73 | ||
85 | /* a type chosen by DEFINE */ | 74 | #include "ints.h" |
86 | #ifdef HAVE_64BIT_INT_CUSTOM | 75 | typedef ui64_t ZPOS64_T; |
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 | ||
103 | 76 | ||
104 | /* Maximum unsigned 32-bit value used as placeholder for zip64 */ | 77 | /* Maximum unsigned 32-bit value used as placeholder for zip64 */ |
105 | #ifndef MAXU32 | 78 | #ifndef MAXU32 |