diff options
author | Matthias Klose <doko@ubuntu.com> | 2017-01-13 12:10:39 +0000 |
---|---|---|
committer | Matthias Klose <doko@gcc.gnu.org> | 2017-01-13 12:10:39 +0000 |
commit | b7aa844d134204e302acc0c3f36f416656491305 (patch) | |
tree | 9dc36718c039f9b387af813329eb2b4c17b149e0 /zlib/contrib/vstudio/vc10 | |
parent | 2252a8025df20cb5c58659cde04ac0ee0eee3ee1 (diff) | |
download | gcc-b7aa844d134204e302acc0c3f36f416656491305.tar.gz |
2017-01-13 Matthias Klose <doko@ubuntu.com>
* Import zlib 1.2.10.
* configure: Regenerate.
From-SVN: r244429
Diffstat (limited to 'zlib/contrib/vstudio/vc10')
-rw-r--r-- | zlib/contrib/vstudio/vc10/zlib.rc | 8 | ||||
-rw-r--r-- | zlib/contrib/vstudio/vc10/zlibvc.def | 12 |
2 files changed, 15 insertions, 5 deletions
diff --git a/zlib/contrib/vstudio/vc10/zlib.rc b/zlib/contrib/vstudio/vc10/zlib.rc index 73f6476d605..f1c19bcec08 100644 --- a/zlib/contrib/vstudio/vc10/zlib.rc +++ b/zlib/contrib/vstudio/vc10/zlib.rc @@ -2,8 +2,8 @@ #define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1,2,8,0
- PRODUCTVERSION 1,2,8,0
+ FILEVERSION 1, 2, 10, 0
+ PRODUCTVERSION 1, 2, 10, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.8\0"
+ VALUE "FileVersion", "1.2.10\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
- VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+ VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
END
END
BLOCK "VarFileInfo"
diff --git a/zlib/contrib/vstudio/vc10/zlibvc.def b/zlib/contrib/vstudio/vc10/zlibvc.def index 63670467220..54e683d99c3 100644 --- a/zlib/contrib/vstudio/vc10/zlibvc.def +++ b/zlib/contrib/vstudio/vc10/zlibvc.def @@ -1,7 +1,7 @@ LIBRARY
; zlib data compression and ZIP file I/O library
-VERSION 1.2.8
+VERSION 1.2
EXPORTS
adler32 @1
@@ -141,3 +141,13 @@ EXPORTS ; zlib1 v1.2.8 added:
inflateGetDictionary @166
gzvprintf @167
+
+; zlib1 v1.2.9 added:
+ inflateCodesUsed @168
+ inflateValidate @169
+ uncompress2 @170
+ gzfread @171
+ gzfwrite @172
+ deflateGetDictionary @173
+ adler32_z @174
+ crc32_z @175
|