summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compat/zlib/ChangeLog5
-rw-r--r--compat/zlib/README4
-rw-r--r--compat/zlib/win32/zlib.def2
-rw-r--r--compat/zlib/zlib.h9
4 files changed, 15 insertions, 5 deletions
diff --git a/compat/zlib/ChangeLog b/compat/zlib/ChangeLog
index 0123d4b..e65d5b5 100644
--- a/compat/zlib/ChangeLog
+++ b/compat/zlib/ChangeLog
@@ -1,6 +1,9 @@
ChangeLog file for zlib
+Changes in 1.2.3-f-tcl (19 Dec 2008)
+- add symbols deflateSetHeader and inflateGetHeader to win32/zlib.def
+
Changes in 1.2.3 (18 July 2005)
- Apply security vulnerability fixes to contrib/infback9 as well
- Clean up some text files (carriage returns, trailing space)
@@ -599,7 +602,7 @@ Changes in 1.0.6 (19 Jan 1998)
- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
- added makelcc.bat for lcc-win32 (Tom St Denis)
- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id: ChangeLog,v 1.1 2008/12/18 14:14:59 dkf Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- Avoid expanded $Id: ChangeLog,v 1.2 2008/12/19 09:14:03 nijtmans Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
- check for unistd.h in configure (for off_t)
- remove useless check parameter in inflate_blocks_free
- avoid useless assignment of s->check to itself in inflate_blocks_new
diff --git a/compat/zlib/README b/compat/zlib/README
index 758cc50..3ebffb0 100644
--- a/compat/zlib/README
+++ b/compat/zlib/README
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.3 is a general purpose data compression library. All the code is
+zlib 1.2.3.f-tcl 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)
@@ -33,7 +33,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
issue of Dr. Dobb's Journal; a copy of the article is available in
http://dogma.net/markn/articles/zlibtool/zlibtool.htm
-The changes made in version 1.2.3 are documented in the file ChangeLog.
+The changes made in version 1.2.3.f-tcl are documented in the file ChangeLog.
Unsupported third party contributions are provided in directory "contrib".
diff --git a/compat/zlib/win32/zlib.def b/compat/zlib/win32/zlib.def
index a47cbc1..278805f 100644
--- a/compat/zlib/win32/zlib.def
+++ b/compat/zlib/win32/zlib.def
@@ -15,12 +15,14 @@ EXPORTS
deflateParams
deflateBound
deflatePrime
+ deflateSetHeader
inflateSetDictionary
inflateSync
inflateCopy
inflateReset
inflateBack
inflateBackEnd
+ inflateGetHeader
zlibCompileFlags
; utility functions
compress
diff --git a/compat/zlib/zlib.h b/compat/zlib/zlib.h
index 0228179..586ab31 100644
--- a/compat/zlib/zlib.h
+++ b/compat/zlib/zlib.h
@@ -37,8 +37,13 @@
extern "C" {
#endif
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
+/* This version is modified from the original
+ * sources, in that the symbols deflateSetHeader
+ * and inflateGetHeader are added to win32/zlib.def
+ * modified by nijtmans@users.sourceforge.net
+ */
+#define ZLIB_VERSION "1.2.3.f-tcl"
+#define ZLIB_VERNUM 0x123f
/*
The 'zlib' compression library provides in-memory compression and