aboutsummaryrefslogtreecommitdiff
path: root/zlib/win32
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2017-02-20 12:52:22 +0000
committerNick Clifton <nickc@redhat.com>2017-02-20 12:52:22 +0000
commit9c7e3b0e6b5234c39d1269fdf1a1413e2a734a79 (patch)
tree6741c1e41fc9409262816a02b2e3ee366a942e7c /zlib/win32
parent0db8980cc0ee05727c11f8b7c6674137a4d5de4e (diff)
downloadgdb-9c7e3b0e6b5234c39d1269fdf1a1413e2a734a79.zip
gdb-9c7e3b0e6b5234c39d1269fdf1a1413e2a734a79.tar.gz
gdb-9c7e3b0e6b5234c39d1269fdf1a1413e2a734a79.tar.bz2
Sync ZLIB with FSF GCC sources, bringing in version 1.2.11.
- Fix deflate stored bug when pulling last block from window - Permit immediate deflateParams changes before any deflate input
Diffstat (limited to 'zlib/win32')
-rw-r--r--zlib/win32/Makefile.msc2
-rw-r--r--zlib/win32/README-WIN32.txt6
-rw-r--r--zlib/win32/VisualC.txt2
-rw-r--r--zlib/win32/zlib1.rc2
4 files changed, 6 insertions, 6 deletions
diff --git a/zlib/win32/Makefile.msc b/zlib/win32/Makefile.msc
index 67b7731..6831882 100644
--- a/zlib/win32/Makefile.msc
+++ b/zlib/win32/Makefile.msc
@@ -1,5 +1,5 @@
# Makefile for zlib using Microsoft (Visual) C
-# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
+# zlib is copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
#
# Usage:
# nmake -f win32/Makefile.msc (standard build)
diff --git a/zlib/win32/README-WIN32.txt b/zlib/win32/README-WIN32.txt
index 16adcca..df7ab7f 100644
--- a/zlib/win32/README-WIN32.txt
+++ b/zlib/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.10 is a general purpose data compression library. All the code is
+zlib 1.2.11 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
Manifest:
-The package zlib-1.2.10-win32-x86.zip will contain the following files:
+The package zlib-1.2.11-win32-x86.zip will contain the following files:
README-WIN32.txt This document
ChangeLog Changes since previous zlib packages
@@ -72,7 +72,7 @@ are too numerous to cite here.
Copyright notice:
- (C) 1995-2012 Jean-loup Gailly and Mark Adler
+ (C) 1995-2017 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
diff --git a/zlib/win32/VisualC.txt b/zlib/win32/VisualC.txt
index 579a5fc..1005b21 100644
--- a/zlib/win32/VisualC.txt
+++ b/zlib/win32/VisualC.txt
@@ -1,3 +1,3 @@
To build zlib using the Microsoft Visual C++ environment,
-use the appropriate project from the projects/ directory.
+use the appropriate project from the contrib/vstudio/ directory.
diff --git a/zlib/win32/zlib1.rc b/zlib/win32/zlib1.rc
index 5c0feed..234e641 100644
--- a/zlib/win32/zlib1.rc
+++ b/zlib/win32/zlib1.rc
@@ -26,7 +26,7 @@ BEGIN
VALUE "FileDescription", "zlib data compression library\0"
VALUE "FileVersion", ZLIB_VERSION "\0"
VALUE "InternalName", "zlib1.dll\0"
- VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+ VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
VALUE "OriginalFilename", "zlib1.dll\0"
VALUE "ProductName", "zlib\0"
VALUE "ProductVersion", ZLIB_VERSION "\0"