summaryrefslogtreecommitdiffstats
path: root/compat
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-12-22 12:50:14 (GMT)
committernijtmans <nijtmans>2008-12-22 12:50:14 (GMT)
commit47a7a034d40e70286b3927f608a136b73a245584 (patch)
tree6e8f16722de988d490eacbf165aa5d6f683d646a /compat
parentd8c0b8c3cb13319e54c3f8deda3a7e2eef753451 (diff)
downloadtcl-47a7a034d40e70286b3927f608a136b73a245584.zip
tcl-47a7a034d40e70286b3927f608a136b73a245584.tar.gz
tcl-47a7a034d40e70286b3927f608a136b73a245584.tar.bz2
- add more missing symbols from zlib.def
- mark dll build as being a modified verson Both changes backported from (unreleased) zlib-1.2.3.3
Diffstat (limited to 'compat')
-rw-r--r--compat/zlib/win32/zlib.def6
-rw-r--r--compat/zlib/win32/zlib1.rc11
-rw-r--r--compat/zlib/zlib.h5
3 files changed, 16 insertions, 6 deletions
diff --git a/compat/zlib/win32/zlib.def b/compat/zlib/win32/zlib.def
index 278805f..a9e951f 100644
--- a/compat/zlib/win32/zlib.def
+++ b/compat/zlib/win32/zlib.def
@@ -16,6 +16,7 @@ EXPORTS
deflateBound
deflatePrime
deflateSetHeader
+ deflateTune
inflateSetDictionary
inflateSync
inflateCopy
@@ -23,6 +24,8 @@ EXPORTS
inflateBack
inflateBackEnd
inflateGetHeader
+ inflatePrime
+ inflateSyncPoint
zlibCompileFlags
; utility functions
compress
@@ -45,12 +48,15 @@ EXPORTS
gzrewind
gztell
gzeof
+ gzdirect
gzclose
gzerror
gzclearerr
; checksum functions
adler32
+ adler32_combine
crc32
+ crc32_combine
; various hacks, don't look :)
deflateInit_
deflateInit2_
diff --git a/compat/zlib/win32/zlib1.rc b/compat/zlib/win32/zlib1.rc
index 99025c9..77e8388 100644
--- a/compat/zlib/win32/zlib1.rc
+++ b/compat/zlib/win32/zlib1.rc
@@ -1,12 +1,13 @@
-#include <windows.h>
+#include <winver.h>
+#include "../zlib.h"
#ifdef GCC_WINDRES
VS_VERSION_INFO VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
#endif
- FILEVERSION 1,2,2,0
- PRODUCTVERSION 1,2,2,0
+ FILEVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+ PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS 1
@@ -23,12 +24,12 @@ BEGIN
//language ID = U.S. English, char set = Windows, Multilingual
BEGIN
VALUE "FileDescription", "zlib data compression library\0"
- VALUE "FileVersion", "1.2.3\0"
+ VALUE "FileVersion", ZLIB_VERSION "\0"
VALUE "InternalName", "zlib1.dll\0"
VALUE "LegalCopyright", "(C) 1995-2004 Jean-loup Gailly & Mark Adler\0"
VALUE "OriginalFilename", "zlib1.dll\0"
VALUE "ProductName", "zlib\0"
- VALUE "ProductVersion", "1.2.3\0"
+ VALUE "ProductVersion", ZLIB_VERSION "\0"
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
END
END
diff --git a/compat/zlib/zlib.h b/compat/zlib/zlib.h
index 586ab31..78a1b32 100644
--- a/compat/zlib/zlib.h
+++ b/compat/zlib/zlib.h
@@ -1,5 +1,5 @@
/* zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.3, July 18th, 2005
+ version 1.2.3.f-tcl, Dec 22th, 2008
Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
@@ -44,6 +44,9 @@ extern "C" {
*/
#define ZLIB_VERSION "1.2.3.f-tcl"
#define ZLIB_VERNUM 0x123f
+#define ZLIB_VER_MAJOR 1
+#define ZLIB_VER_MINOR 2
+#define ZLIB_VER_REVISION 3
/*
The 'zlib' compression library provides in-memory compression and