1 --- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/adler32.c 2003-11-17 15:24:27.000000000 -0600
2 +++ zlib-1.2.2/adler32.c 2005-02-28 19:04:09.000000000 -0600
6 /* ========================================================================= */
7 -uLong ZEXPORT adler32(adler, buf, len)
8 +ZEXPORT uLong adler32(adler, buf, len)
12 --- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/compress.c 2003-07-07 00:37:56.000000000 -0500
13 +++ zlib-1.2.2/compress.c 2005-02-28 19:04:09.000000000 -0600
15 memory, Z_BUF_ERROR if there was not enough room in the output buffer,
16 Z_STREAM_ERROR if the level parameter is invalid.
18 -int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
19 +ZEXPORT int compress2 (dest, destLen, source, sourceLen, level)
25 /* ===========================================================================
27 -int ZEXPORT compress (dest, destLen, source, sourceLen)
28 +ZEXPORT int compress (dest, destLen, source, sourceLen)
33 If the default memLevel or windowBits for deflateInit() is changed, then
34 this function needs to be updated.
36 -uLong ZEXPORT compressBound (sourceLen)
37 +ZEXPORT uLong compressBound (sourceLen)
40 return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
41 --- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/crc32.c 2004-10-03 21:29:30.000000000 -0500
42 +++ zlib-1.2.2/crc32.c 2005-02-28 19:04:09.000000000 -0600
44 /* =========================================================================
45 * This function can be used by asm versions of crc32()
47 -const unsigned long FAR * ZEXPORT get_crc_table()
48 +ZEXPORT const unsigned long FAR * get_crc_table()
50 #ifdef DYNAMIC_CRC_TABLE
53 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
55 /* ========================================================================= */
56 -unsigned long ZEXPORT crc32(crc, buf, len)
57 +ZEXPORT unsigned long crc32(crc, buf, len)
59 const unsigned char FAR *buf;
61 --- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/deflate.c 2004-09-15 09:28:14.000000000 -0500
62 +++ zlib-1.2.2/deflate.c 2005-02-28 19:04:09.000000000 -0600
64 zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
66 /* ========================================================================= */
67 -int ZEXPORT deflateInit_(strm, level, version, stream_size)
68 +ZEXPORT int deflateInit_(strm, level, version, stream_size)
75 /* ========================================================================= */
76 -int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
77 +ZEXPORT int deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
84 /* ========================================================================= */
85 -int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
86 +ZEXPORT int deflateSetDictionary (strm, dictionary, dictLength)
88 const Bytef *dictionary;
93 /* ========================================================================= */
94 -int ZEXPORT deflateReset (strm)
95 +ZEXPORT int deflateReset (strm)
102 /* ========================================================================= */
103 -int ZEXPORT deflatePrime (strm, bits, value)
104 +ZEXPORT int deflatePrime (strm, bits, value)
111 /* ========================================================================= */
112 -int ZEXPORT deflateParams(strm, level, strategy)
113 +ZEXPORT int deflateParams(strm, level, strategy)
118 * But even the conservative upper bound of about 14% expansion does not
119 * seem onerous for output buffer allocation.
121 -uLong ZEXPORT deflateBound(strm, sourceLen)
122 +ZEXPORT uLong deflateBound(strm, sourceLen)
129 /* ========================================================================= */
130 -int ZEXPORT deflate (strm, flush)
131 +ZEXPORT int deflate (strm, flush)
138 /* ========================================================================= */
139 -int ZEXPORT deflateEnd (strm)
140 +ZEXPORT int deflateEnd (strm)
145 * To simplify the source, this is not supported for 16-bit MSDOS (which
146 * doesn't have enough memory anyway to duplicate compression states).
148 -int ZEXPORT deflateCopy (dest, source)
149 +ZEXPORT int deflateCopy (dest, source)
153 --- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/gzio.c 2004-10-03 21:30:37.000000000 -0500
154 +++ zlib-1.2.2/gzio.c 2005-02-28 19:06:11.000000000 -0600
156 /* ===========================================================================
157 Opens a gzip (.gz) file for reading or writing.
159 -gzFile ZEXPORT gzopen (path, mode)
160 +ZEXPORT gzFile gzopen (path, mode)
165 Associate a gzFile with the file descriptor fd. fd is not dup'ed here
166 to mimic the behavio(u)r of fdopen.
168 -gzFile ZEXPORT gzdopen (fd, mode)
169 +ZEXPORT gzFile gzdopen (fd, mode)
174 /* ===========================================================================
175 * Update the compression level and strategy
177 -int ZEXPORT gzsetparams (file, level, strategy)
178 +ZEXPORT int gzsetparams (file, level, strategy)
183 Reads the given number of uncompressed bytes from the compressed file.
184 gzread returns the number of bytes actually read (0 for end of file).
186 -int ZEXPORT gzread (file, buf, len)
187 +ZEXPORT int gzread (file, buf, len)
192 Reads one byte from the compressed file. gzgetc returns this byte
193 or -1 in case of end of file or error.
195 -int ZEXPORT gzgetc(file)
196 +ZEXPORT int gzgetc(file)
201 /* ===========================================================================
202 Push one byte back onto the stream.
204 -int ZEXPORT gzungetc(c, file)
205 +ZEXPORT int gzungetc(c, file)
211 The current implementation is not optimized at all.
213 -char * ZEXPORT gzgets(file, buf, len)
214 +ZEXPORT char * gzgets(file, buf, len)
219 Writes the given number of uncompressed bytes into the compressed file.
220 gzwrite returns the number of bytes actually written (0 in case of error).
222 -int ZEXPORT gzwrite (file, buf, len)
223 +ZEXPORT int gzwrite (file, buf, len)
231 -int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
232 +ZEXPORTVA int gzprintf (gzFile file, const char *format, /* args */ ...)
234 char buf[Z_PRINTF_BUFSIZE];
238 #else /* not ANSI C */
240 -int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
241 +ZEXPORT intVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
242 a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
246 Writes c, converted to an unsigned char, into the compressed file.
247 gzputc returns the value that was written, or -1 in case of error.
249 -int ZEXPORT gzputc(file, c)
250 +ZEXPORT int gzputc(file, c)
255 the terminating null character.
256 gzputs returns the number of characters written, or -1 in case of error.
258 -int ZEXPORT gzputs(file, s)
259 +ZEXPORT int gzputs(file, s)
264 return s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
267 -int ZEXPORT gzflush (file, flush)
268 +ZEXPORT int gzflush (file, flush)
273 SEEK_END is not implemented, returns error.
274 In this version of the library, gzseek can be extremely slow.
276 -z_off_t ZEXPORT gzseek (file, offset, whence)
277 +ZEXPORT z_off_t gzseek (file, offset, whence)
282 /* ===========================================================================
285 -int ZEXPORT gzrewind (file)
286 +ZEXPORT int gzrewind (file)
289 gz_stream *s = (gz_stream*)file;
291 given compressed file. This position represents a number of bytes in the
292 uncompressed data stream.
294 -z_off_t ZEXPORT gztell (file)
295 +ZEXPORT z_off_t gztell (file)
298 return gzseek(file, 0L, SEEK_CUR);
300 Returns 1 when EOF has previously been detected reading the given
301 input stream, otherwise zero.
303 -int ZEXPORT gzeof (file)
304 +ZEXPORT int gzeof (file)
307 gz_stream *s = (gz_stream*)file;
309 Flushes all pending output if necessary, closes the compressed file
310 and deallocates all the (de)compression state.
312 -int ZEXPORT gzclose (file)
313 +ZEXPORT int gzclose (file)
318 errnum is set to Z_ERRNO and the application may consult errno
319 to get the exact error code.
321 -const char * ZEXPORT gzerror (file, errnum)
322 +ZEXPORT const char * gzerror (file, errnum)
327 /* ===========================================================================
328 Clear the error and end-of-file flags, and do the same for the real file.
330 -void ZEXPORT gzclearerr (file)
331 +ZEXPORT void gzclearerr (file)
334 gz_stream *s = (gz_stream*)file;
335 --- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/infback.c 2004-10-03 21:31:20.000000000 -0500
336 +++ zlib-1.2.2/infback.c 2005-02-28 19:04:09.000000000 -0600
338 windowBits is in the range 8..15, and window is a user-supplied
339 window and output buffer that is 2**windowBits bytes.
341 -int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
342 +ZEXPORT int inflateBackInit_(strm, windowBits, window, version, stream_size)
345 unsigned char FAR *window;
347 inflateBack() can also return Z_STREAM_ERROR if the input parameters
348 are not correct, i.e. strm is Z_NULL or the state was not initialized.
350 -int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
351 +ZEXPORT int inflateBack(strm, in, in_desc, out, out_desc)
359 -int ZEXPORT inflateBackEnd(strm)
360 +ZEXPORT int inflateBackEnd(strm)
363 if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
364 --- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/inflate.c 2004-10-03 21:33:51.000000000 -0500
365 +++ zlib-1.2.2/inflate.c 2005-02-28 19:04:09.000000000 -0600
367 local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
370 -int ZEXPORT inflateReset(strm)
371 +ZEXPORT int inflateReset(strm)
374 struct inflate_state FAR *state;
379 -int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
380 +ZEXPORT int inflateInit2_(strm, windowBits, version, stream_size)
385 return inflateReset(strm);
388 -int ZEXPORT inflateInit_(strm, version, stream_size)
389 +ZEXPORT int inflateInit_(strm, version, stream_size)
394 will return Z_BUF_ERROR if it has not reached the end of the stream.
397 -int ZEXPORT inflate(strm, flush)
398 +ZEXPORT int inflate(strm, flush)
402 @@ -1085,7 +1085,7 @@
406 -int ZEXPORT inflateEnd(strm)
407 +ZEXPORT int inflateEnd(strm)
410 struct inflate_state FAR *state;
411 @@ -1099,7 +1099,7 @@
415 -int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
416 +ZEXPORT int inflateSetDictionary(strm, dictionary, dictLength)
418 const Bytef *dictionary;
420 @@ -1171,7 +1171,7 @@
424 -int ZEXPORT inflateSync(strm)
425 +ZEXPORT int inflateSync(strm)
428 unsigned len; /* number of bytes to look at or looked at */
429 @@ -1222,7 +1222,7 @@
430 block. When decompressing, PPP checks that at the end of input packet,
431 inflate is waiting for these length bytes.
433 -int ZEXPORT inflateSyncPoint(strm)
434 +ZEXPORT int inflateSyncPoint(strm)
437 struct inflate_state FAR *state;
438 @@ -1232,7 +1232,7 @@
439 return state->mode == STORED && state->bits == 0;
442 -int ZEXPORT inflateCopy(dest, source)
443 +ZEXPORT int inflateCopy(dest, source)
447 --- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/uncompr.c 2003-07-07 00:36:56.000000000 -0500
448 +++ zlib-1.2.2/uncompr.c 2005-02-28 19:04:09.000000000 -0600
450 enough memory, Z_BUF_ERROR if there was not enough room in the output
451 buffer, or Z_DATA_ERROR if the input data was corrupted.
453 -int ZEXPORT uncompress (dest, destLen, source, sourceLen)
454 +ZEXPORT int uncompress (dest, destLen, source, sourceLen)
458 --- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zconf.in.h 2004-05-30 15:38:00.000000000 -0500
459 +++ zlib-1.2.2/zconf.in.h 2005-02-28 19:04:09.000000000 -0600
463 # if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
464 -# ifdef ZLIB_INTERNAL
465 -# define ZEXTERN extern __declspec(dllexport)
467 -# define ZEXTERN extern __declspec(dllimport)
469 +# define ZDLLLOCAL __declspec(dllimport)
470 +# define ZDLLPUBLIC __declspec(dllexport)
471 +# define ZEXTERN extern
473 # endif /* ZLIB_DLL */
474 /* If building or using zlib with the WINAPI/WINAPIV calling convention,
475 @@ -223,30 +221,45 @@
476 # define ZEXPORTVA FAR CDECL
481 -#if defined (__BEOS__)
482 +#elif defined (__BEOS__)
484 -# ifdef ZLIB_INTERNAL
485 -# define ZEXPORT __declspec(dllexport)
486 -# define ZEXPORTVA __declspec(dllexport)
488 -# define ZEXPORT __declspec(dllimport)
489 -# define ZEXPORTVA __declspec(dllimport)
491 +# define ZDLLIMPORT __declspec(dllimport)
492 +# define ZDLLPUBLIC __declspec(dllexport)
497 +# ifdef GCC_HASCLASSVISIBILITY
498 +# define ZDLLLOCAL __attribute__ ((visibility("hidden")))
499 +# define ZDLLPUBLIC __attribute__ ((visibility("default")))
507 # define ZEXTERN extern
514 +#ifdef ZLIB_INTERNAL
520 +# define ZEXPORT ZDLLPUBLIC
523 +# define ZEXPORTVA ZDLLPUBLIC
527 +# define ZEXPORT ZDLLIMPORT
530 +# define ZEXPORTVA ZDLLIMPORT
537 --- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zlib.h 2004-10-03 21:57:26.000000000 -0500
538 +++ zlib-1.2.2/zlib.h 2005-02-28 19:04:09.000000000 -0600
541 /* basic functions */
543 -ZEXTERN const char * ZEXPORT zlibVersion OF((void));
544 +ZEXTERN ZEXPORT const char * zlibVersion OF((void));
545 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
546 If the first character differs, the library code actually used is
547 not compatible with the zlib.h header file used by the application.
552 -ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
553 +ZEXTERN ZEXPORT int deflateInit OF((z_streamp strm, int level));
555 Initializes the internal stream state for compression. The fields
556 zalloc, zfree and opaque must be initialized before by the caller.
561 -ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
562 +ZEXTERN ZEXPORT int deflate OF((z_streamp strm, int flush));
564 deflate compresses as much data as possible, and stops when the input
565 buffer becomes empty or the output buffer becomes full. It may introduce some
570 -ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
571 +ZEXTERN ZEXPORT int deflateEnd OF((z_streamp strm));
573 All dynamically allocated data structures for this stream are freed.
574 This function discards any unprocessed input and does not flush any
579 -ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
580 +ZEXTERN ZEXPORT int inflateInit OF((z_streamp strm));
582 Initializes the internal stream state for decompression. The fields
583 next_in, avail_in, zalloc, zfree and opaque must be initialized before by
588 -ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
589 +ZEXTERN ZEXPORT int inflate OF((z_streamp strm, int flush));
591 inflate decompresses as much data as possible, and stops when the input
592 buffer becomes empty or the output buffer becomes full. It may introduce
597 -ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
598 +ZEXTERN ZEXPORT int inflateEnd OF((z_streamp strm));
600 All dynamically allocated data structures for this stream are freed.
601 This function discards any unprocessed input and does not flush any
606 -ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
607 +ZEXTERN ZEXPORT int deflateInit2 OF((z_streamp strm,
612 not perform any compression: this will be done by deflate().
615 -ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
616 +ZEXTERN ZEXPORT int deflateSetDictionary OF((z_streamp strm,
617 const Bytef *dictionary,
621 perform any compression: this will be done by deflate().
624 -ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
625 +ZEXTERN ZEXPORT int deflateCopy OF((z_streamp dest,
628 Sets the destination stream as a complete copy of the source stream.
633 -ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
634 +ZEXTERN ZEXPORT int deflateReset OF((z_streamp strm));
636 This function is equivalent to deflateEnd followed by deflateInit,
637 but does not free and reallocate all the internal compression state.
639 stream state was inconsistent (such as zalloc or state being NULL).
642 -ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
643 +ZEXTERN ZEXPORT int deflateParams OF((z_streamp strm,
648 if strm->avail_out was zero.
651 -ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
652 +ZEXTERN ZEXPORT uLong deflateBound OF((z_streamp strm,
655 deflateBound() returns an upper bound on the compressed size after
657 for deflation in a single pass, and so would be called before deflate().
660 -ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
661 +ZEXTERN ZEXPORT int deflatePrime OF((z_streamp strm,
669 -ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
670 +ZEXTERN ZEXPORT int inflateInit2 OF((z_streamp strm,
673 This is another version of inflateInit with an extra parameter. The
675 modified, but next_out and avail_out are unchanged.)
678 -ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
679 +ZEXTERN ZEXPORT int inflateSetDictionary OF((z_streamp strm,
680 const Bytef *dictionary,
687 -ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
688 +ZEXTERN ZEXPORT int inflateSync OF((z_streamp strm));
690 Skips invalid compressed data until a full flush point (see above the
691 description of deflate with Z_FULL_FLUSH) can be found, or until all
693 until success or end of the input data.
696 -ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
697 +ZEXTERN ZEXPORT int inflateCopy OF((z_streamp dest,
700 Sets the destination stream as a complete copy of the source stream.
705 -ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
706 +ZEXTERN ZEXPORT int inflateReset OF((z_streamp strm));
708 This function is equivalent to inflateEnd followed by inflateInit,
709 but does not free and reallocate all the internal decompression state.
714 -ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits,
715 +ZEXTERN ZEXPORT int inflateBackInit OF((z_stream FAR *strm, int windowBits,
716 unsigned char FAR *window));
718 Initialize the internal stream state for decompression using inflateBack()
720 typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
721 typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
723 -ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR *strm,
724 +ZEXTERN ZEXPORT int inflateBack OF((z_stream FAR *strm,
725 in_func in, void FAR *in_desc,
726 out_func out, void FAR *out_desc));
729 that inflateBack() cannot return Z_OK.
732 -ZEXTERN int ZEXPORT inflateBackEnd OF((z_stream FAR *strm));
733 +ZEXTERN ZEXPORT int inflateBackEnd OF((z_stream FAR *strm));
735 All memory allocated by inflateBackInit() is freed.
738 state was inconsistent.
741 -ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
742 +ZEXTERN ZEXPORT uLong zlibCompileFlags OF((void));
743 /* Return flags indicating compile-time options.
745 Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
747 utility functions can easily be modified if you need special options.
750 -ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen,
751 +ZEXTERN ZEXPORT int compress OF((Bytef *dest, uLongf *destLen,
752 const Bytef *source, uLong sourceLen));
754 Compresses the source buffer into the destination buffer. sourceLen is
759 -ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen,
760 +ZEXTERN ZEXPORT int compress2 OF((Bytef *dest, uLongf *destLen,
761 const Bytef *source, uLong sourceLen,
764 @@ -904,14 +904,14 @@
765 Z_STREAM_ERROR if the level parameter is invalid.
768 -ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
769 +ZEXTERN ZEXPORT uLong compressBound OF((uLong sourceLen));
771 compressBound() returns an upper bound on the compressed size after
772 compress() or compress2() on sourceLen bytes. It would be used before
773 a compress() or compress2() call to allocate the destination buffer.
776 -ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen,
777 +ZEXTERN ZEXPORT int uncompress OF((Bytef *dest, uLongf *destLen,
778 const Bytef *source, uLong sourceLen));
780 Decompresses the source buffer into the destination buffer. sourceLen is
783 typedef voidp gzFile;
785 -ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
786 +ZEXTERN ZEXPORT gzFile gzopen OF((const char *path, const char *mode));
788 Opens a gzip (.gz) file for reading or writing. The mode parameter
789 is as in fopen ("rb" or "wb") but can also include a compression level
791 can be checked to distinguish the two cases (if errno is zero, the
792 zlib error is Z_MEM_ERROR). */
794 -ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
795 +ZEXTERN ZEXPORT gzFile gzdopen OF((int fd, const char *mode));
797 gzdopen() associates a gzFile with the file descriptor fd. File
798 descriptors are obtained from calls like open, dup, creat, pipe or
800 the (de)compression state.
803 -ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
804 +ZEXTERN ZEXPORT int gzsetparams OF((gzFile file, int level, int strategy));
806 Dynamically update the compression level or strategy. See the description
807 of deflateInit2 for the meaning of these parameters.
812 -ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
813 +ZEXTERN ZEXPORT int gzread OF((gzFile file, voidp buf, unsigned len));
815 Reads the given number of uncompressed bytes from the compressed file.
816 If the input file was not in gzip format, gzread copies the given number
818 gzread returns the number of uncompressed bytes actually read (0 for
819 end of file, -1 for error). */
821 -ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
822 +ZEXTERN ZEXPORT int gzwrite OF((gzFile file,
823 voidpc buf, unsigned len));
825 Writes the given number of uncompressed bytes into the compressed file.
827 (0 in case of error).
830 -ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
831 +ZEXTERN ZEXPORTVA int gzprintf OF((gzFile file, const char *format, ...));
833 Converts, formats, and writes the args to the compressed file under
834 control of the format string, as in fprintf. gzprintf returns the number of
835 @@ -999,14 +999,14 @@
836 because the secure snprintf() or vsnprintf() functions were not available.
839 -ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
840 +ZEXTERN ZEXPORT int gzputs OF((gzFile file, const char *s));
842 Writes the given null-terminated string to the compressed file, excluding
843 the terminating null character.
844 gzputs returns the number of characters written, or -1 in case of error.
847 -ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
848 +ZEXTERN ZEXPORT char * gzgets OF((gzFile file, char *buf, int len));
850 Reads bytes from the compressed file until len-1 characters are read, or
851 a newline character is read and transferred to buf, or an end-of-file
852 @@ -1015,19 +1015,19 @@
853 gzgets returns buf, or Z_NULL in case of error.
856 -ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
857 +ZEXTERN ZEXPORT int gzputc OF((gzFile file, int c));
859 Writes c, converted to an unsigned char, into the compressed file.
860 gzputc returns the value that was written, or -1 in case of error.
863 -ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
864 +ZEXTERN ZEXPORT int gzgetc OF((gzFile file));
866 Reads one byte from the compressed file. gzgetc returns this byte
867 or -1 in case of end of file or error.
870 -ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
871 +ZEXTERN ZEXPORT int gzungetc OF((int c, gzFile file));
873 Push one character back onto the stream to be read again later.
874 Only one character of push-back is allowed. gzungetc() returns the
875 @@ -1037,7 +1037,7 @@
879 -ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
880 +ZEXTERN ZEXPORT int gzflush OF((gzFile file, int flush));
882 Flushes all pending output into the compressed file. The parameter
883 flush is as in the deflate() function. The return value is the zlib
884 @@ -1047,7 +1047,7 @@
888 -ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
889 +ZEXTERN ZEXPORT z_off_t gzseek OF((gzFile file,
890 z_off_t offset, int whence));
892 Sets the starting position for the next gzread or gzwrite on the
893 @@ -1065,14 +1065,14 @@
894 would be before the current position.
897 -ZEXTERN int ZEXPORT gzrewind OF((gzFile file));
898 +ZEXTERN ZEXPORT int gzrewind OF((gzFile file));
900 Rewinds the given file. This function is supported only for reading.
902 gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
905 -ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file));
906 +ZEXTERN ZEXPORT z_off_t gztell OF((gzFile file));
908 Returns the starting position for the next gzread or gzwrite on the
909 given compressed file. This position represents a number of bytes in the
910 @@ -1081,20 +1081,20 @@
911 gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
914 -ZEXTERN int ZEXPORT gzeof OF((gzFile file));
915 +ZEXTERN ZEXPORT int gzeof OF((gzFile file));
917 Returns 1 when EOF has previously been detected reading the given
918 input stream, otherwise zero.
921 -ZEXTERN int ZEXPORT gzclose OF((gzFile file));
922 +ZEXTERN ZEXPORT int gzclose OF((gzFile file));
924 Flushes all pending output if necessary, closes the compressed file
925 and deallocates all the (de)compression state. The return value is the zlib
926 error number (see function gzerror below).
929 -ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
930 +ZEXTERN ZEXPORT const char * gzerror OF((gzFile file, int *errnum));
932 Returns the error message for the last error which occurred on the
933 given compressed file. errnum is set to zlib error number. If an
934 @@ -1103,7 +1103,7 @@
935 to get the exact error code.
938 -ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
939 +ZEXTERN ZEXPORT void gzclearerr OF((gzFile file));
941 Clears the error and end-of-file flags for file. This is analogous to the
942 clearerr() function in stdio. This is useful for continuing to read a gzip
943 @@ -1118,7 +1118,7 @@
947 -ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
948 +ZEXTERN ZEXPORT uLong adler32 OF((uLong adler, const Bytef *buf, uInt len));
951 Update a running Adler-32 checksum with the bytes buf[0..len-1] and
952 @@ -1135,7 +1135,7 @@
953 if (adler != original_adler) error();
956 -ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
957 +ZEXTERN ZEXPORT uLong crc32 OF((uLong crc, const Bytef *buf, uInt len));
959 Update a running crc with the bytes buf[0..len-1] and return the updated
960 crc. If buf is NULL, this function returns the required initial value
961 @@ -1157,17 +1157,17 @@
962 /* deflateInit and inflateInit are macros to allow checking the zlib version
963 * and the compiler's view of z_stream:
965 -ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
966 +ZEXTERN ZEXPORT int deflateInit_ OF((z_streamp strm, int level,
967 const char *version, int stream_size));
968 -ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
969 +ZEXTERN ZEXPORT int inflateInit_ OF((z_streamp strm,
970 const char *version, int stream_size));
971 -ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method,
972 +ZEXTERN ZEXPORT int deflateInit2_ OF((z_streamp strm, int level, int method,
973 int windowBits, int memLevel,
974 int strategy, const char *version,
976 -ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits,
977 +ZEXTERN ZEXPORT int inflateInit2_ OF((z_streamp strm, int windowBits,
978 const char *version, int stream_size));
979 -ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits,
980 +ZEXTERN ZEXPORT int inflateBackInit_ OF((z_stream FAR *strm, int windowBits,
981 unsigned char FAR *window,
984 @@ -1189,9 +1189,9 @@
985 struct internal_state {int dummy;}; /* hack for buggy compilers */
988 -ZEXTERN const char * ZEXPORT zError OF((int));
989 -ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z));
990 -ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void));
991 +ZEXTERN ZEXPORT const char * zError OF((int));
992 +ZEXTERN ZEXPORT int inflateSyncPoint OF((z_streamp z));
993 +ZEXTERN ZEXPORT const uLongf * get_crc_table OF((void));
997 --- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zutil.c 2003-08-27 21:34:34.000000000 -0500
998 +++ zlib-1.2.2/zutil.c 2005-02-28 19:04:09.000000000 -0600
1003 -const char * ZEXPORT zlibVersion()
1004 +ZEXPORT const char * zlibVersion()
1006 return ZLIB_VERSION;
1009 -uLong ZEXPORT zlibCompileFlags()
1010 +ZEXPORT uLong zlibCompileFlags()
1015 /* exported to allow conversion of error code to string for compress() and
1018 -const char * ZEXPORT zError(err)
1019 +ZEXPORT const char * zError(err)
1022 return ERR_MSG(err);