Skip to content

Commit e75de02

Browse files
committed
zlib 1.2.6
1 parent 68a0224 commit e75de02

File tree

6 files changed

+31
-7
lines changed

6 files changed

+31
-7
lines changed

ChangeLog

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,32 @@
11

22
ChangeLog file for zlib
33

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

731
Changes in 1.2.5.3 (15 Jan 2012)
832
- Restore gzgetc function for binary compatibility

gzguts.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* gzguts.h -- zlib internal header definitions for gz* operations
2-
* Copyright (C) 2004, 2005, 2010, 2011 Mark Adler
2+
* Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
33
* For conditions of distribution and use, see copyright notice in zlib.h
44
*/
55

gzwrite.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* gzwrite.c -- zlib functions for writing gzip files
2-
* Copyright (C) 2004, 2005, 2010, 2011 Mark Adler
2+
* Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
33
* For conditions of distribution and use, see copyright notice in zlib.h
44
*/
55

zlib.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH ZLIB 3 "xx Jan 2012"
1+
.TH ZLIB 3 "29 Jan 2012"
22
.SH NAME
33
zlib \- compression/decompression library
44
.SH SYNOPSIS

zlib.3.pdf

0 Bytes
Binary file not shown.

zlib.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* zlib.h -- interface of the 'zlib' general purpose compression library
2-
version 1.2.6, January xxth, 2012
2+
version 1.2.6, January 29th, 2012
33
44
Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
55
@@ -37,7 +37,7 @@
3737
extern "C" {
3838
#endif
3939

40-
#define ZLIB_VERSION "1.2.6-motley"
40+
#define ZLIB_VERSION "1.2.6"
4141
#define ZLIB_VERNUM 0x1260
4242
#define ZLIB_VER_MAJOR 1
4343
#define ZLIB_VER_MINOR 2

0 commit comments

Comments
 (0)