diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-11 10:03:18 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-11 10:03:18 (GMT) |
| commit | 7475433fc2d4d5df9d885664d8c7f430d61e7c84 (patch) | |
| tree | f0ce649ff6c20ba0f4150fb0d9d10fdd8def247c /generic/tclVar.c | |
| parent | 8229cd730444707ecef238b9678a5c8d779554f0 (diff) | |
| parent | 089b9970444fbf3410572b30650c80fc75bdda82 (diff) | |
| download | tcl-7475433fc2d4d5df9d885664d8c7f430d61e7c84.zip tcl-7475433fc2d4d5df9d885664d8c7f430d61e7c84.tar.gz tcl-7475433fc2d4d5df9d885664d8c7f430d61e7c84.tar.bz2 | |
Merge 8.7, resolve conflicts
Diffstat (limited to 'generic/tclVar.c')
| -rw-r--r-- | generic/tclVar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c index c21ba2f..b3aee51 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -665,7 +665,7 @@ TclObjLookupVarEx( */ size_t len; - const char *part1 = TclGetStringFromObj(part1Ptr, &len); + const char *part1 = Tcl_GetStringFromObj(part1Ptr, &len); if ((len > 1) && (part1[len - 1] == ')')) { const char *part2 = strchr(part1, '('); @@ -848,7 +848,7 @@ TclLookupSimpleVar( ResolverScheme *resPtr; int isNew, i, result; size_t varLen; - const char *varName = TclGetStringFromObj(varNamePtr, &varLen); + const char *varName = Tcl_GetStringFromObj(varNamePtr, &varLen); varPtr = NULL; varNsPtr = NULL; /* Set non-NULL if a nonlocal variable. */ @@ -983,7 +983,7 @@ TclLookupSimpleVar( Tcl_Obj *objPtr = *objPtrPtr; if (objPtr) { - localNameStr = TclGetStringFromObj(objPtr, &localLen); + localNameStr = Tcl_GetStringFromObj(objPtr, &localLen); if ((varLen == localLen) && (varName[0] == localNameStr[0]) && !memcmp(varName, localNameStr, varLen)) { |