summaryrefslogtreecommitdiffstats
path: root/generic/tclZlib.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2021-01-15 21:46:54 (GMT)
committerdgp <dgp@users.sourceforge.net>2021-01-15 21:46:54 (GMT)
commit3d5d443c72f5b384643fecf9bdaa1c20800261bd (patch)
tree56c4d265fdc9fc6f49860bab2f4822447ffdf855 /generic/tclZlib.c
parentd56c55457797cecd40ae706ddd0476f26e76b3ba (diff)
parent089b9970444fbf3410572b30650c80fc75bdda82 (diff)
downloadtcl-3d5d443c72f5b384643fecf9bdaa1c20800261bd.zip
tcl-3d5d443c72f5b384643fecf9bdaa1c20800261bd.tar.gz
tcl-3d5d443c72f5b384643fecf9bdaa1c20800261bd.tar.bz2
Merge TIP 481 (resolve conflicts)
Diffstat (limited to 'generic/tclZlib.c')
-rw-r--r--generic/tclZlib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index b8e8d54..6960294 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -3709,7 +3709,7 @@ ZlibStackChannelTransform(
if (compDictObj != NULL) {
cd->compDictObj = Tcl_DuplicateObj(compDictObj);
Tcl_IncrRefCount(cd->compDictObj);
- Tcl_GetByteArrayFromObj(cd->compDictObj, NULL);
+ TclGetByteArrayFromObj(cd->compDictObj, NULL);
}
if (format == TCL_ZLIB_FORMAT_RAW) {