summaryrefslogtreecommitdiffstats
path: root/generic/tclZlib.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-25 23:38:49 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-25 23:38:49 (GMT)
commitacb9caa95921a281c8b7f34b030deb1c3049281c (patch)
tree74302fc20666030f2e2cf87268482a29e0695ccb /generic/tclZlib.c
parent342be44f4da2cc09411fd0dc070ddcab26d87355 (diff)
parent03c4df2e30d98d74775a50ee28ce007ae6b41d87 (diff)
downloadtcl-acb9caa95921a281c8b7f34b030deb1c3049281c.zip
tcl-acb9caa95921a281c8b7f34b030deb1c3049281c.tar.gz
tcl-acb9caa95921a281c8b7f34b030deb1c3049281c.tar.bz2
merge novem
Diffstat (limited to 'generic/tclZlib.c')
-rw-r--r--generic/tclZlib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 9c1176e..ea3b9cc 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -763,7 +763,7 @@ Tcl_ZlibStreamInit(
*/
if (interp != NULL) {
- if (Tcl_Eval(interp, "::incr ::tcl::zlib::cmdcounter") != TCL_OK) {
+ if (Tcl_EvalEx(interp, "::incr ::tcl::zlib::cmdcounter", -1, 0) != TCL_OK) {
goto error;
}
Tcl_DStringInit(&cmdname);
@@ -3847,7 +3847,7 @@ TclZlibInit(
* commands.
*/
- Tcl_Eval(interp, "namespace eval ::tcl::zlib {variable cmdcounter 0}");
+ Tcl_EvalEx(interp, "namespace eval ::tcl::zlib {variable cmdcounter 0}", -1, 0);
/*
* Create the public scripted interface to this file's functionality.
@@ -3865,13 +3865,13 @@ TclZlibInit(
cfg[0].key = "zlibVersion";
cfg[0].value = zlibVersion();
cfg[1].key = NULL;
- Tcl_RegisterConfig(interp, "zlib", cfg, "ascii");
+ Tcl_RegisterConfig(interp, "zlib", cfg, "iso8859-1");
/*
* Formally provide the package as a Tcl built-in.
*/
- return Tcl_PkgProvide(interp, "zlib", TCL_ZLIB_VERSION);
+ return Tcl_PkgProvideEx(interp, "zlib", TCL_ZLIB_VERSION, NULL);
}
/*