diff options
author | DLL125 <134442578+DLL125@users.noreply.github.com> | 2023-08-20 09:21:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-20 09:21:54 +0200 |
commit | 4f92ba548445e84bab61e06f89ee1e341a92f716 (patch) | |
tree | c4409ca025048e7b6f99555b22b026ec5898e06e /src/Common/zlib/gzguts.h | |
parent | 89d340271c4d584b649eb9974f15a1ee557c91a1 (diff) | |
download | VeraCrypt-4f92ba548445e84bab61e06f89ee1e341a92f716.tar.gz VeraCrypt-4f92ba548445e84bab61e06f89ee1e341a92f716.zip |
Update zlib to latest (#1181)
* Update zlib to latest
* Update copyright
Updated copyright of zlib.
Diffstat (limited to 'src/Common/zlib/gzguts.h')
-rw-r--r-- | src/Common/zlib/gzguts.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/Common/zlib/gzguts.h b/src/Common/zlib/gzguts.h index 57faf371..f9375047 100644 --- a/src/Common/zlib/gzguts.h +++ b/src/Common/zlib/gzguts.h @@ -7,9 +7,8 @@ # ifndef _LARGEFILE_SOURCE # define _LARGEFILE_SOURCE 1 # endif -# ifdef _FILE_OFFSET_BITS -# undef _FILE_OFFSET_BITS -# endif +# undef _FILE_OFFSET_BITS +# undef _TIME_BITS #endif #ifdef HAVE_HIDDEN @@ -119,8 +118,8 @@ /* gz* functions always use library allocation functions */ #ifndef STDC - extern voidp malloc OF((uInt size)); - extern void free OF((voidpf ptr)); + extern voidp malloc(uInt size); + extern void free(voidpf ptr); #endif /* get errno and strerror definition */ @@ -138,10 +137,10 @@ /* provide prototypes for these when building zlib without LFS */ #if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); - ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); - ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); + ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *); + ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int); + ZEXTERN z_off64_t ZEXPORT gztell64(gzFile); + ZEXTERN z_off64_t ZEXPORT gzoffset64(gzFile); #endif /* default memLevel */ @@ -203,9 +202,9 @@ typedef struct { typedef gz_state FAR *gz_statep; /* shared functions */ -void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *)); +void ZLIB_INTERNAL gz_error(gz_statep, int, const char *); #if defined UNDER_CE -char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error)); +char ZLIB_INTERNAL *gz_strwinerror(DWORD error); #endif /* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t @@ -214,6 +213,6 @@ char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error)); #ifdef INT_MAX # define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX) #else -unsigned ZLIB_INTERNAL gz_intmax OF((void)); +unsigned ZLIB_INTERNAL gz_intmax(void); # define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax()) #endif |