summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-06-06 14:48:50 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-06-06 14:48:50 (GMT)
commit342d27d13f57e57c4e1bc71b6dd00ef6244d8af1 (patch)
treefd529f2632f1dc861808b34d03339ed5cae73f7d
parent0c84699237879a40d13fafbe6f92bff5caa60c44 (diff)
downloadtcl-342d27d13f57e57c4e1bc71b6dd00ef6244d8af1.zip
tcl-342d27d13f57e57c4e1bc71b6dd00ef6244d8af1.tar.gz
tcl-342d27d13f57e57c4e1bc71b6dd00ef6244d8af1.tar.bz2
Declare that Tcl provides the zlib 2.0 package.
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclZlib.c11
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a35eebc..3f089d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-06 Donal K. Fellows <dkf@users.sf.net>
+
+ * generic/tclZlib.c (TclZlibInit): Declare that Tcl is publishing the
+ zlib package (version 2.0) as part of its bootstrap process. This will
+ have an impact on tclkit (which includes zlib 1.1) but otherwise be
+ very low impact.
+
2012-06-06 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tclUnixInit.c: On Cygwin, use win32 API in stead of uname()
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 0ff8b50..b970b3d 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -20,6 +20,15 @@
#include "tclIO.h"
/*
+ * The version of the zlib "package" that this implements. Note that this
+ * thoroughly supersedes the versions included with tclkit, which are "1.1",
+ * so this is at least "2.0" (there's no general *commitment* to have the same
+ * interface, even if that is mostly true).
+ */
+
+#define TCL_ZLIB_VERSION "2.0"
+
+/*
* Magic flags used with wbits fields to indicate that we're handling the gzip
* format or automatic detection of format. Putting it here is slightly less
* gross!
@@ -3127,7 +3136,7 @@ TclZlibInit(
*/
Tcl_CreateObjCommand(interp, "zlib", ZlibCmd, 0, 0);
- return TCL_OK;
+ return Tcl_PkgProvide(interp, "zlib", TCL_ZLIB_VERSION);
}
/*