diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-21 14:05:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-21 14:05:41 (GMT) |
| commit | 27665100ad52dd5d6b91df7e6717944b04645a69 (patch) | |
| tree | 5683214c1138991228778895a5e720dac4986e82 /generic/tclIOGT.c | |
| parent | b3877e5fef6cb8855887a6cfa8c36202b0412076 (diff) | |
| parent | 7475433fc2d4d5df9d885664d8c7f430d61e7c84 (diff) | |
| download | tcl-27665100ad52dd5d6b91df7e6717944b04645a69.zip tcl-27665100ad52dd5d6b91df7e6717944b04645a69.tar.gz tcl-27665100ad52dd5d6b91df7e6717944b04645a69.tar.bz2 | |
Merge TIP 481 (resolve conflicts)
Diffstat (limited to 'generic/tclIOGT.c')
| -rw-r--r-- | generic/tclIOGT.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclIOGT.c b/generic/tclIOGT.c index 6e0ee78..4986c8d 100644 --- a/generic/tclIOGT.c +++ b/generic/tclIOGT.c @@ -440,7 +440,7 @@ ExecuteCallback( break; } resObj = Tcl_GetObjResult(eval); - resBuf = TclGetByteArrayFromObj(resObj, &resLen); + resBuf = Tcl_GetByteArrayFromObj(resObj, &resLen); if (resBuf) { Tcl_WriteRaw(Tcl_GetStackedChannel(dataPtr->self), (char *) resBuf, resLen); @@ -453,7 +453,7 @@ ExecuteCallback( break; } resObj = Tcl_GetObjResult(eval); - resBuf = TclGetByteArrayFromObj(resObj, &resLen); + resBuf = Tcl_GetByteArrayFromObj(resObj, &resLen); if (resBuf) { Tcl_WriteRaw(dataPtr->self, (char *) resBuf, resLen); break; @@ -462,7 +462,7 @@ ExecuteCallback( case TRANSMIT_IBUF: resObj = Tcl_GetObjResult(eval); - resBuf = TclGetByteArrayFromObj(resObj, &resLen); + resBuf = Tcl_GetByteArrayFromObj(resObj, &resLen); if (resBuf) { ResultAdd(&dataPtr->result, resBuf, resLen); break; |