third_party/zlib/zconf.h - Issue 2079313002: Revert of Update Zlib to version 1.2.8

Unified Diff: third_party/zlib/zconf.h

Issue 2079313002: Revert of Update Zlib to version 1.2.8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: third_party/zlib/zconf.h

diff --git a/third_party/zlib/zconf.h b/third_party/zlib/zconf.h

index 1b1d88b9fff89b26256b2b560f4af91dcb7791be..73662d804b10f52fe1d7b87ff7f5ac3ebfb50f84 100644

--- a/third_party/zlib/zconf.h

+++ b/third_party/zlib/zconf.h

@@ -1,5 +1,5 @@

/* zconf.h -- configuration of the zlib compression library

* For conditions of distribution and use, see copyright notice in zlib.h

@@ -18,13 +18,11 @@

* this permanently in zconf.h using "./configure --zprefix".

#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */

-# define Z_PREFIX_SET

/* all linked symbols */

# define _dist_code z__dist_code

# define _length_code z__length_code

# define _tr_align z__tr_align

-# define _tr_flush_bits z__tr_flush_bits

# define _tr_flush_block z__tr_flush_block

# define _tr_init z__tr_init

# define _tr_stored_block z__tr_stored_block

@@ -32,11 +30,9 @@

# define adler32 z_adler32

# define adler32_combine z_adler32_combine

# define adler32_combine64 z_adler32_combine64

-# ifndef Z_SOLO

-# define compress z_compress

-# define compress2 z_compress2

-# define compressBound z_compressBound

-# endif

+# define compress z_compress

+# define compress2 z_compress2

+# define compressBound z_compressBound

# define crc32 z_crc32

# define crc32_combine z_crc32_combine

# define crc32_combine64 z_crc32_combine64

@@ -47,53 +43,44 @@

# define deflateInit2_ z_deflateInit2_

# define deflateInit_ z_deflateInit_

# define deflateParams z_deflateParams

-# define deflatePending z_deflatePending

# define deflatePrime z_deflatePrime

# define deflateReset z_deflateReset

-# define deflateResetKeep z_deflateResetKeep

# define deflateSetDictionary z_deflateSetDictionary

# define deflateSetHeader z_deflateSetHeader

# define deflateTune z_deflateTune

# define deflate_copyright z_deflate_copyright

# define get_crc_table z_get_crc_table

-# ifndef Z_SOLO

-# define gz_error z_gz_error

-# define gz_intmax z_gz_intmax

-# define gz_strwinerror z_gz_strwinerror

-# define gzbuffer z_gzbuffer

-# define gzclearerr z_gzclearerr

-# define gzclose z_gzclose

-# define gzclose_r z_gzclose_r

-# define gzclose_w z_gzclose_w

-# define gzdirect z_gzdirect

-# define gzdopen z_gzdopen

-# define gzeof z_gzeof

-# define gzerror z_gzerror

-# define gzflush z_gzflush

-# define gzgetc z_gzgetc

-# define gzgetc_ z_gzgetc_

-# define gzgets z_gzgets

-# define gzoffset z_gzoffset

-# define gzoffset64 z_gzoffset64

-# define gzopen z_gzopen

-# define gzopen64 z_gzopen64

-# ifdef _WIN32

-# define gzopen_w z_gzopen_w

-# endif

-# define gzprintf z_gzprintf

-# define gzvprintf z_gzvprintf

-# define gzputc z_gzputc

-# define gzputs z_gzputs

-# define gzread z_gzread

-# define gzrewind z_gzrewind

-# define gzseek z_gzseek

-# define gzseek64 z_gzseek64

-# define gzsetparams z_gzsetparams

-# define gztell z_gztell

-# define gztell64 z_gztell64

-# define gzungetc z_gzungetc

-# define gzwrite z_gzwrite

-# endif

+# define gz_error z_gz_error

+# define gz_intmax z_gz_intmax

+# define gz_strwinerror z_gz_strwinerror

+# define gzbuffer z_gzbuffer

+# define gzclearerr z_gzclearerr

+# define gzclose z_gzclose

+# define gzclose_r z_gzclose_r

+# define gzclose_w z_gzclose_w

+# define gzdirect z_gzdirect

+# define gzdopen z_gzdopen

+# define gzeof z_gzeof

+# define gzerror z_gzerror

+# define gzflush z_gzflush

+# define gzgetc z_gzgetc

+# define gzgets z_gzgets

+# define gzoffset z_gzoffset

+# define gzoffset64 z_gzoffset64

+# define gzopen z_gzopen

+# define gzopen64 z_gzopen64

+# define gzprintf z_gzprintf

+# define gzputc z_gzputc

+# define gzputs z_gzputs

+# define gzread z_gzread

+# define gzrewind z_gzrewind

+# define gzseek z_gzseek

+# define gzseek64 z_gzseek64

+# define gzsetparams z_gzsetparams

+# define gztell z_gztell

+# define gztell64 z_gztell64

+# define gzungetc z_gzungetc

+# define gzwrite z_gzwrite

# define inflate z_inflate

# define inflateBack z_inflateBack

# define inflateBackEnd z_inflateBackEnd

@@ -108,22 +95,16 @@

# define inflateReset z_inflateReset

# define inflateReset2 z_inflateReset2

# define inflateSetDictionary z_inflateSetDictionary

-# define inflateGetDictionary z_inflateGetDictionary

# define inflateSync z_inflateSync

# define inflateSyncPoint z_inflateSyncPoint

# define inflateUndermine z_inflateUndermine

-# define inflateResetKeep z_inflateResetKeep

# define inflate_copyright z_inflate_copyright

# define inflate_fast z_inflate_fast

# define inflate_table z_inflate_table

-# ifndef Z_SOLO

-# define uncompress z_uncompress

-# endif

+# define uncompress z_uncompress

# define zError z_zError

-# ifndef Z_SOLO

-# define zcalloc z_zcalloc

-# define zcfree z_zcfree

-# endif

+# define zcalloc z_zcalloc

+# define zcfree z_zcfree

# define zlibCompileFlags z_zlibCompileFlags

# define zlibVersion z_zlibVersion

@@ -133,9 +114,7 @@

# define alloc_func z_alloc_func

# define charf z_charf

# define free_func z_free_func

-# ifndef Z_SOLO

-# define gzFile z_gzFile

-# endif

+# define gzFile z_gzFile

# define gz_header z_gz_header

# define gz_headerp z_gz_headerp

# define in_func z_in_func

@@ -221,12 +200,6 @@

# endif

#endif

-#if defined(ZLIB_CONST) && !defined(z_const)

-# define z_const const

-#else

-# define z_const

-#endif

/* Some Mac compilers merge all .h files incorrectly: */

#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)

# define NO_DUMMY_DECL

@@ -270,14 +243,6 @@

# define OF(args) args

# else

# define OF(args) ()

-# endif

-#endif

-#ifndef Z_ARG /* function prototypes for stdarg */

-# if defined(STDC) || defined(Z_HAVE_STDARG_H)

-# define Z_ARG(args) args

-# else

-# define Z_ARG(args) ()

# endif

#endif

@@ -394,47 +359,12 @@

typedef Byte *voidp;

#endif

-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)

-# include <limits.h>

-# if (UINT_MAX == 0xffffffffUL)

-# define Z_U4 unsigned

-# elif (ULONG_MAX == 0xffffffffUL)

-# define Z_U4 unsigned long

-# elif (USHRT_MAX == 0xffffffffUL)

-# define Z_U4 unsigned short

-# endif

-#endif

-#ifdef Z_U4

- typedef Z_U4 z_crc_t;

-#else

- typedef unsigned long z_crc_t;

-#endif

#if !defined(_WIN32)

# define Z_HAVE_UNISTD_H

#endif

-#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */

-# define Z_HAVE_STDARG_H

-#endif

#ifdef STDC

-# ifndef Z_SOLO

-# include <sys/types.h> /* for off_t */

-# endif

-#endif

-#if defined(STDC) || defined(Z_HAVE_STDARG_H)

-# ifndef Z_SOLO

-# include <stdarg.h> /* for va_list */

-# endif

-#endif

-#ifdef _WIN32

-# ifndef Z_SOLO

-# include <stddef.h> /* for wchar_t */

-# endif

+# include <sys/types.h> /* for off_t */

#endif

/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and

@@ -443,38 +373,21 @@

* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as

* equivalently requesting no 64-bit operations

-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1

+#if -_LARGEFILE64_SOURCE - -1 == 1

# undef _LARGEFILE64_SOURCE

#endif

-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)

-# define Z_HAVE_UNISTD_H

-#endif

-#ifndef Z_SOLO

-# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)

-# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */

-# ifdef VMS

-# include <unixio.h> /* for off_t */

-# endif

-# ifndef z_off_t

-# define z_off_t off_t

-# endif

-#endif

-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0

-# define Z_LFS64

-#endif

-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)

-# define Z_LARGE64

-#endif

-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)

-# define Z_WANT64

-#endif

-#if !defined(SEEK_SET) && !defined(Z_SOLO)

+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)

+# include <unistd.h> /* for SEEK_* and off_t */

+# ifdef VMS

+# include <unixio.h> /* for off_t */

+# endif

+# ifndef z_off_t

+# define z_off_t off_t

+# endif

+#endif

+#ifndef SEEK_SET

# define SEEK_SET 0 /* Seek from beginning of file. */

# define SEEK_CUR 1 /* Seek from current position. */

# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */

@@ -484,14 +397,18 @@

# define z_off_t long

#endif

-#if !defined(_WIN32) && defined(Z_LARGE64)

+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0

# define z_off64_t off64_t

#else

-# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)

-# define z_off64_t __int64

-# else

-# define z_off64_t z_off_t

-# endif

+# define z_off64_t z_off_t

+#endif

+#if defined(__OS400__)

+# define NO_vsnprintf

+#endif

+#if defined(__MVS__)

+# define NO_vsnprintf

#endif

/* MVS linker does not support external names larger than 8 bytes */

« no previous file with comments | « third_party/zlib/uncompr.c ('k') | third_party/zlib/zlib.h » ('j') | no next file with comments »