diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2024-02-11 15:42:08 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2024-02-11 15:42:08 -0800 |
| commit | 5c42a230b7b468dff011f444161c0145b5efae59 (patch) | |
| tree | 9d8913fd58381156a2a8370936c35004fc58c43a | |
| parent | 04134633fa6f8a9ac87ffd4b2683ca61bd41acd6 (diff) | |
| download | zlib-5c42a230b7b468dff011f444161c0145b5efae59.tar.gz zlib-5c42a230b7b468dff011f444161c0145b5efae59.tar.bz2 zlib-5c42a230b7b468dff011f444161c0145b5efae59.zip | |
Correct argument types for 64-bit combine functions.
Diffstat (limited to '')
| -rw-r--r-- | zlib.h | 6 | ||||
| -rw-r--r-- | zutil.h | 9 |
2 files changed, 7 insertions, 8 deletions
| @@ -1891,9 +1891,9 @@ ZEXTERN int ZEXPORT gzgetc_(gzFile file); /* backward compatibility */ | |||
| 1891 | ZEXTERN z_off_t ZEXPORT gzseek64(gzFile, z_off_t, int); | 1891 | ZEXTERN z_off_t ZEXPORT gzseek64(gzFile, z_off_t, int); |
| 1892 | ZEXTERN z_off_t ZEXPORT gztell64(gzFile); | 1892 | ZEXTERN z_off_t ZEXPORT gztell64(gzFile); |
| 1893 | ZEXTERN z_off_t ZEXPORT gzoffset64(gzFile); | 1893 | ZEXTERN z_off_t ZEXPORT gzoffset64(gzFile); |
| 1894 | ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off_t); | 1894 | ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t); |
| 1895 | ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off_t); | 1895 | ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t); |
| 1896 | ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off_t); | 1896 | ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t); |
| 1897 | # endif | 1897 | # endif |
| 1898 | #else | 1898 | #else |
| 1899 | ZEXTERN gzFile ZEXPORT gzopen(const char *, const char *); | 1899 | ZEXTERN gzFile ZEXPORT gzopen(const char *, const char *); |
| @@ -168,11 +168,10 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ | |||
| 168 | #endif | 168 | #endif |
| 169 | 169 | ||
| 170 | /* provide prototypes for these when building zlib without LFS */ | 170 | /* provide prototypes for these when building zlib without LFS */ |
| 171 | #if !defined(_WIN32) && \ | 171 | #ifndef Z_LARGE64 |
| 172 | (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) | 172 | ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t); |
| 173 | ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off_t); | 173 | ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t); |
| 174 | ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off_t); | 174 | ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t); |
| 175 | ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off_t); | ||
| 176 | #endif | 175 | #endif |
| 177 | 176 | ||
| 178 | /* common defaults */ | 177 | /* common defaults */ |