diff --git a/ChangeLog b/ChangeLog index 9bc4abeb..42be01f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,19 @@ ChangeLog file for zlib -Changes in 1.2.6.1 (xx Jan 2012) -- +Changes in 1.2.6.1 (12 Feb 2012) +- Avoid the use of the Objective-C reserved name "id" +- Include io.h in gzguts.h for Microsoft compilers +- Fix problem with ./configure --prefix and gzgetc macro +- Include gz_header definition when compiling zlib solo +- Put gzflags() functionality back in zutil.c +- Avoid library header include in crc32.c for Z_SOLO +- Use name in GCC_CLASSIC as C compiler for coverage testing, if set +- Minor cleanup in contrib/minizip/zip.c [Vollant] +- Update make_vms.com [Zinser] +- Remove unnecessary gzgetc_ function +- Use optimized byte swap operations for Microsoft and GNU [Snyder] +- Fix minor typo in zlib.h comments [Rzesniowiecki] Changes in 1.2.6 (29 Jan 2012) - Update the Pascal interface in contrib/pascal diff --git a/crc32.c b/crc32.c index 95225ef5..5cfc8ff0 100644 --- a/crc32.c +++ b/crc32.c @@ -1,5 +1,5 @@ /* crc32.c -- compute the CRC-32 of a data stream - * Copyright (C) 1995-2006, 2010, 2011 Mark Adler + * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h * * Thanks to Rodney Brown for his contribution of faster diff --git a/gzread.c b/gzread.c index e2578678..bac5d229 100644 --- a/gzread.c +++ b/gzread.c @@ -1,5 +1,5 @@ /* gzread.c -- zlib functions for reading gzip files - * Copyright (C) 2004, 2005, 2010, 2011 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/inflate.c b/inflate.c index 70cd7d91..47418a1e 100644 --- a/inflate.c +++ b/inflate.c @@ -1,5 +1,5 @@ /* inflate.c -- zlib decompression - * Copyright (C) 1995-2011 Mark Adler + * Copyright (C) 1995-2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/zconf.h b/zconf.h index 7c7e7982..7f705dfb 100644 --- a/zconf.h +++ b/zconf.h @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2011 Jean-loup Gailly. + * Copyright (C) 1995-2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/zconf.h.cmakein b/zconf.h.cmakein index c299fb16..9510eabd 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2011 Jean-loup Gailly. + * Copyright (C) 1995-2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/zconf.h.in b/zconf.h.in index 7c7e7982..7f705dfb 100644 --- a/zconf.h.in +++ b/zconf.h.in @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2011 Jean-loup Gailly. + * Copyright (C) 1995-2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/zlib.3 b/zlib.3 index 4dd6f491..a0bd902b 100644 --- a/zlib.3 +++ b/zlib.3 @@ -1,4 +1,4 @@ -.TH ZLIB 3 "xx Jan 2012" +.TH ZLIB 3 "12 Feb 2012" .SH NAME zlib \- compression/decompression library .SH SYNOPSIS diff --git a/zlib.3.pdf b/zlib.3.pdf index 653b67bc..d92cef05 100644 Binary files a/zlib.3.pdf and b/zlib.3.pdf differ diff --git a/zlib.h b/zlib.h index db47bf8d..d65af434 100644 --- a/zlib.h +++ b/zlib.h @@ -1,5 +1,5 @@ /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.6.1, January xxth, 2012 + version 1.2.6.1, February 12th, 2012 Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler @@ -37,7 +37,7 @@ extern "C" { #endif -#define ZLIB_VERSION "1.2.6.1-motley" +#define ZLIB_VERSION "1.2.6.1" #define ZLIB_VERNUM 0x1261 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 2 diff --git a/zutil.c b/zutil.c index 12517b40..65e0d3b7 100644 --- a/zutil.c +++ b/zutil.c @@ -1,5 +1,5 @@ /* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2005, 2010, 2011 Jean-loup Gailly. + * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/zutil.h b/zutil.h index 2f4d14d2..69d83ed7 100644 --- a/zutil.h +++ b/zutil.h @@ -1,5 +1,5 @@ /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2011 Jean-loup Gailly. + * Copyright (C) 1995-2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -255,7 +255,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define ZSWAP32(q) __builtin_bswap32(q) #else # define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ - (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) + (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) #endif #endif /* ZUTIL_H */