diff options
| author | Wendigo <84196391+wendig0x@users.noreply.github.com> | 2023-05-19 23:15:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-19 22:15:01 +0200 |
| commit | 8fc866df4070e23ec0cc88a84c8ecfd456dfb30d (patch) | |
| tree | 6673d7677b0a25d0d656d92febaeca6194e0b1ed /src/Common/zlib/zutil.c | |
| parent | 21918e33b66f371952ebed20f3b13317e8a94831 (diff) | |
| download | VeraCrypt-8fc866df4070e23ec0cc88a84c8ecfd456dfb30d.tar.gz VeraCrypt-8fc866df4070e23ec0cc88a84c8ecfd456dfb30d.zip | |
update zlib to latest version 1.2.13 (#986)
Diffstat (limited to 'src/Common/zlib/zutil.c')
| -rw-r--r-- | src/Common/zlib/zutil.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/Common/zlib/zutil.c b/src/Common/zlib/zutil.c index dcab28a0..9543ae82 100644 --- a/src/Common/zlib/zutil.c +++ b/src/Common/zlib/zutil.c @@ -61,9 +61,11 @@ uLong ZEXPORT zlibCompileFlags() #ifdef ZLIB_DEBUG flags += 1 << 8; #endif + /* #if defined(ASMV) || defined(ASMINF) flags += 1 << 9; #endif + */ #ifdef ZLIB_WINAPI flags += 1 << 10; #endif @@ -119,7 +121,7 @@ uLong ZEXPORT zlibCompileFlags() # endif int ZLIB_INTERNAL z_verbose = verbose; -void ZLIB_INTERNAL z_error (m) +void ZLIB_INTERNAL z_error(m) char *m; { fprintf(stderr, "%s\n", m); @@ -214,7 +216,7 @@ local ptr_table table[MAX_PTR]; * a protected system like OS/2. Use Microsoft C instead. */ -voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) +voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) { voidpf buf; ulg bsize = (ulg)items*size; @@ -240,7 +242,7 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) return buf; } -void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) +void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) { int n; @@ -277,13 +279,13 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) # define _hfree hfree #endif -voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) +voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size) { (void)opaque; return _halloc((long)items, size); } -void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) +void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) { (void)opaque; _hfree(ptr); @@ -302,7 +304,7 @@ extern voidp calloc OF((uInt items, uInt size)); extern void free OF((voidpf ptr)); #endif -voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) +voidpf ZLIB_INTERNAL zcalloc(opaque, items, size) voidpf opaque; unsigned items; unsigned size; @@ -312,7 +314,7 @@ voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) (voidpf)calloc(items, size); } -void ZLIB_INTERNAL zcfree (opaque, ptr) +void ZLIB_INTERNAL zcfree(opaque, ptr) voidpf opaque; voidpf ptr; { |