Skip to content

Commit

Permalink
zlib 1.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
madler committed Jan 29, 2012
1 parent 68a0224 commit e75de02
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 7 deletions.
28 changes: 26 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,8 +1,32 @@

ChangeLog file for zlib

Changes in 1.2.6 (xx Jan 2012)
-
Changes in 1.2.6 (29 Jan 2012)
- Update the Pascal interface in contrib/pascal
- Fix function numbers for gzgetc_ in zlibvc.def files
- Fix configure.ac for contrib/minizip [Schiffer]
- Fix large-entry detection in minizip on 64-bit systems [Schiffer]
- Have ./configure use the compiler return code for error indication
- Fix CMakeLists.txt for cross compilation [McClure]
- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes]
- Fix compilation of contrib/minizip on FreeBSD [Marquez]
- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath]
- Include io.h for Turbo C / Borland C on all platforms [Truta]
- Make version explicit in contrib/minizip/configure.ac [Bosmans]
- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant]
- Minor cleanup up contrib/minizip/unzip.c [Vollant]
- Fix bug when compiling minizip with C++ [Vollant]
- Protect for long name and extra fields in contrib/minizip [Vollant]
- Avoid some warnings in contrib/minizip [Vollant]
- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
- Add missing libs to minizip linker command
- Add support for VPATH builds in contrib/minizip
- Add an --enable-demos option to contrib/minizip/configure
- Add the generation of configure.log by ./configure
- Exit when required parameters not provided to win32/Makefile.gcc
- Have gzputc return the character written instead of the argument
- Use the -m option on ldconfig for BSD systems [Tobias]
- Correct in zlib.map when deflateResetKeep was added

Changes in 1.2.5.3 (15 Jan 2012)
- Restore gzgetc function for binary compatibility
Expand Down
2 changes: 1 addition & 1 deletion gzguts.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* gzguts.h -- zlib internal header definitions for gz* operations
* 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
*/

Expand Down
2 changes: 1 addition & 1 deletion gzwrite.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* gzwrite.c -- zlib functions for writing 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
*/

Expand Down
2 changes: 1 addition & 1 deletion zlib.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH ZLIB 3 "xx Jan 2012"
.TH ZLIB 3 "29 Jan 2012"
.SH NAME
zlib \- compression/decompression library
.SH SYNOPSIS
Expand Down
Binary file modified zlib.3.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions zlib.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.2.6, January xxth, 2012
version 1.2.6, January 29th, 2012
Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
Expand Down Expand Up @@ -37,7 +37,7 @@
extern "C" {
#endif

#define ZLIB_VERSION "1.2.6-motley"
#define ZLIB_VERSION "1.2.6"
#define ZLIB_VERNUM 0x1260
#define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR 2
Expand Down

0 comments on commit e75de02

Please sign in to comment.