diff options
Diffstat (limited to 'zutil.c')
-rw-r--r-- | zutil.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -117,9 +117,9 @@ uLong ZEXPORT zlibCompileFlags() | |||
117 | # ifndef verbose | 117 | # ifndef verbose |
118 | # define verbose 0 | 118 | # define verbose 0 |
119 | # endif | 119 | # endif |
120 | int z_verbose = verbose; | 120 | int ZLIB_INTERNAL z_verbose = verbose; |
121 | 121 | ||
122 | void z_error (m) | 122 | void ZLIB_INTERNAL z_error (m) |
123 | char *m; | 123 | char *m; |
124 | { | 124 | { |
125 | fprintf(stderr, "%s\n", m); | 125 | fprintf(stderr, "%s\n", m); |
@@ -146,7 +146,7 @@ const char * ZEXPORT zError(err) | |||
146 | 146 | ||
147 | #ifndef HAVE_MEMCPY | 147 | #ifndef HAVE_MEMCPY |
148 | 148 | ||
149 | void zmemcpy(dest, source, len) | 149 | void ZLIB_INTERNAL zmemcpy(dest, source, len) |
150 | Bytef* dest; | 150 | Bytef* dest; |
151 | const Bytef* source; | 151 | const Bytef* source; |
152 | uInt len; | 152 | uInt len; |
@@ -157,7 +157,7 @@ void zmemcpy(dest, source, len) | |||
157 | } while (--len != 0); | 157 | } while (--len != 0); |
158 | } | 158 | } |
159 | 159 | ||
160 | int zmemcmp(s1, s2, len) | 160 | int ZLIB_INTERNAL zmemcmp(s1, s2, len) |
161 | const Bytef* s1; | 161 | const Bytef* s1; |
162 | const Bytef* s2; | 162 | const Bytef* s2; |
163 | uInt len; | 163 | uInt len; |
@@ -170,7 +170,7 @@ int zmemcmp(s1, s2, len) | |||
170 | return 0; | 170 | return 0; |
171 | } | 171 | } |
172 | 172 | ||
173 | void zmemzero(dest, len) | 173 | void ZLIB_INTERNAL zmemzero(dest, len) |
174 | Bytef* dest; | 174 | Bytef* dest; |
175 | uInt len; | 175 | uInt len; |
176 | { | 176 | { |
@@ -213,7 +213,7 @@ local ptr_table table[MAX_PTR]; | |||
213 | * a protected system like OS/2. Use Microsoft C instead. | 213 | * a protected system like OS/2. Use Microsoft C instead. |
214 | */ | 214 | */ |
215 | 215 | ||
216 | voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) | 216 | voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) |
217 | { | 217 | { |
218 | voidpf buf = opaque; /* just to make some compilers happy */ | 218 | voidpf buf = opaque; /* just to make some compilers happy */ |
219 | ulg bsize = (ulg)items*size; | 219 | ulg bsize = (ulg)items*size; |
@@ -237,7 +237,7 @@ voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) | |||
237 | return buf; | 237 | return buf; |
238 | } | 238 | } |
239 | 239 | ||
240 | void zcfree (voidpf opaque, voidpf ptr) | 240 | void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) |
241 | { | 241 | { |
242 | int n; | 242 | int n; |
243 | if (*(ush*)&ptr != 0) { /* object < 64K */ | 243 | if (*(ush*)&ptr != 0) { /* object < 64K */ |
@@ -272,13 +272,13 @@ void zcfree (voidpf opaque, voidpf ptr) | |||
272 | # define _hfree hfree | 272 | # define _hfree hfree |
273 | #endif | 273 | #endif |
274 | 274 | ||
275 | voidpf zcalloc (voidpf opaque, uInt items, uInt size) | 275 | voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) |
276 | { | 276 | { |
277 | if (opaque) opaque = 0; /* to make compiler happy */ | 277 | if (opaque) opaque = 0; /* to make compiler happy */ |
278 | return _halloc((long)items, size); | 278 | return _halloc((long)items, size); |
279 | } | 279 | } |
280 | 280 | ||
281 | void zcfree (voidpf opaque, voidpf ptr) | 281 | void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) |
282 | { | 282 | { |
283 | if (opaque) opaque = 0; /* to make compiler happy */ | 283 | if (opaque) opaque = 0; /* to make compiler happy */ |
284 | _hfree(ptr); | 284 | _hfree(ptr); |
@@ -297,7 +297,7 @@ extern voidp calloc OF((uInt items, uInt size)); | |||
297 | extern void free OF((voidpf ptr)); | 297 | extern void free OF((voidpf ptr)); |
298 | #endif | 298 | #endif |
299 | 299 | ||
300 | voidpf zcalloc (opaque, items, size) | 300 | voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) |
301 | voidpf opaque; | 301 | voidpf opaque; |
302 | unsigned items; | 302 | unsigned items; |
303 | unsigned size; | 303 | unsigned size; |
@@ -307,7 +307,7 @@ voidpf zcalloc (opaque, items, size) | |||
307 | (voidpf)calloc(items, size); | 307 | (voidpf)calloc(items, size); |
308 | } | 308 | } |
309 | 309 | ||
310 | void zcfree (opaque, ptr) | 310 | void ZLIB_INTERNAL zcfree (opaque, ptr) |
311 | voidpf opaque; | 311 | voidpf opaque; |
312 | voidpf ptr; | 312 | voidpf ptr; |
313 | { | 313 | { |