summaryrefslogtreecommitdiffstats
path: root/generic/tclLiteral.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-08-14 07:24:45 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-08-14 07:24:45 (GMT)
commit6e2f02a5a6a694d1c1ad853307791acf1fd85c92 (patch)
tree7d98f24bc0e1f58d9bf18be980e4d1cbc157947e /generic/tclLiteral.c
parent20bd9d9cabc9db212abbaf9d4dbb18eb490e9f71 (diff)
parentc9376306301e578615cfee52d2121f78cb31a225 (diff)
downloadtcl-6e2f02a5a6a694d1c1ad853307791acf1fd85c92.zip
tcl-6e2f02a5a6a694d1c1ad853307791acf1fd85c92.tar.gz
tcl-6e2f02a5a6a694d1c1ad853307791acf1fd85c92.tar.bz2
Merge 8.7
Diffstat (limited to 'generic/tclLiteral.c')
-rw-r--r--generic/tclLiteral.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 50f8e38..5982cc8 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -209,7 +209,7 @@ TclCreateLiteral(
*/
int objLength;
- char *objBytes = TclGetStringFromObj(objPtr, &objLength);
+ const char *objBytes = TclGetStringFromObj(objPtr, &objLength);
if ((objLength == length) && ((length == 0)
|| ((objBytes[0] == bytes[0])
@@ -408,7 +408,7 @@ TclRegisterLiteral(
Tcl_Obj *objPtr;
unsigned hash;
unsigned int localHash;
- int objIndex, new;
+ int objIndex, isNew;
Namespace *nsPtr;
if (length < 0) {
@@ -462,7 +462,7 @@ TclRegisterLiteral(
*/
globalPtr = NULL;
- objPtr = TclCreateLiteral(iPtr, bytes, length, hash, &new, nsPtr, flags,
+ objPtr = TclCreateLiteral(iPtr, bytes, length, hash, &isNew, nsPtr, flags,
&globalPtr);
objIndex = AddLocalLiteralEntry(envPtr, objPtr, localHash);