From fdeeb9226bef15ce8cb188b9ceeb3f2a6f063b6c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 14 May 2017 20:34:59 +0300 Subject: Revert "zlib: updated to version 1.2.11" This reverts commit cd6513f3037456f6c7c3a8d051be51d62cb9bd88. --- libs/zlib/src/gzguts.h | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'libs/zlib/src/gzguts.h') diff --git a/libs/zlib/src/gzguts.h b/libs/zlib/src/gzguts.h index 990a4d2514..d87659d031 100644 --- a/libs/zlib/src/gzguts.h +++ b/libs/zlib/src/gzguts.h @@ -1,5 +1,5 @@ /* gzguts.h -- zlib internal header definitions for gz* operations - * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -25,10 +25,6 @@ # include # include #endif - -#ifndef _POSIX_SOURCE -# define _POSIX_SOURCE -#endif #include #ifdef _WIN32 @@ -39,10 +35,6 @@ # include #endif -#if defined(_WIN32) || defined(__CYGWIN__) -# define WIDECHAR -#endif - #ifdef WINAPI_FAMILY # define open _open # define read _read @@ -103,19 +95,18 @@ # endif #endif -/* unlike snprintf (which is required in C99), _snprintf does not guarantee - null termination of the result -- however this is only used in gzlib.c where +/* unlike snprintf (which is required in C99, yet still not supported by + Microsoft more than a decade later!), _snprintf does not guarantee null + termination of the result -- however this is only used in gzlib.c where the result is assured to fit in the space provided */ -#if defined(_MSC_VER) && _MSC_VER < 1900 +#ifdef _MSC_VER # define snprintf _snprintf #endif #ifndef local # define local static #endif -/* since "static" is used to mean two completely different things in C, we - define "local" for the non-static meaning of "static", for readability - (compile with -Dlocal if your debugger can't find static symbols) */ +/* compile with -Dlocal if your debugger can't find static symbols */ /* gz* functions always use library allocation functions */ #ifndef STDC @@ -179,7 +170,7 @@ typedef struct { char *path; /* path or fd for error messages */ unsigned size; /* buffer size, zero if not allocated yet */ unsigned want; /* requested buffer size, default is GZBUFSIZE */ - unsigned char *in; /* input buffer (double-sized when writing) */ + unsigned char *in; /* input buffer */ unsigned char *out; /* output buffer (double-sized when reading) */ int direct; /* 0 if processing gzip, 1 if transparent */ /* just for reading */ -- cgit v1.2.3