summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-12-06 14:38:28 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-12-06 14:38:28 (GMT)
commit5aef84d1f4ff017e3debb4a78d85fdc332793dc2 (patch)
treeb6a72c2550d2a43c8708a9c64ec390b7a3d842c8
parente2ecc3c09076c30d20a229730804c4fe369f82d6 (diff)
parentf67bef714e0e58aec5b6050f7ff17d878011c689 (diff)
downloadtcl-5aef84d1f4ff017e3debb4a78d85fdc332793dc2.zip
tcl-5aef84d1f4ff017e3debb4a78d85fdc332793dc2.tar.gz
tcl-5aef84d1f4ff017e3debb4a78d85fdc332793dc2.tar.bz2
Merge 8.6
-rw-r--r--generic/tclEncoding.c4
-rw-r--r--generic/tclTimer.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index cf738ed..50afec0 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -622,13 +622,13 @@ TclInitEncodingSubsystem(void)
type.freeProc = NULL;
type.nullSize = 2;
type.encodingName = "utf-16le";
- type.clientData = INT2PTR(1);;
+ type.clientData = INT2PTR(1);
Tcl_CreateEncoding(&type);
type.encodingName = "utf-16be";
type.clientData = INT2PTR(0);
Tcl_CreateEncoding(&type);
type.encodingName = "utf-16";
- type.clientData = INT2PTR(isLe.c);;
+ type.clientData = INT2PTR(isLe.c);
Tcl_CreateEncoding(&type);
#ifndef TCL_NO_DEPRECATED
diff --git a/generic/tclTimer.c b/generic/tclTimer.c
index 934b329..7e04b3e 100644
--- a/generic/tclTimer.c
+++ b/generic/tclTimer.c
@@ -892,7 +892,7 @@ Tcl_AfterObjCmd(
if (objc == 3) {
commandPtr = objv[2];
} else {
- commandPtr = Tcl_ConcatObj(objc-2, objv+2);;
+ commandPtr = Tcl_ConcatObj(objc-2, objv+2);
}
command = TclGetStringFromObj(commandPtr, &length);
for (afterPtr = assocPtr->firstAfterPtr; afterPtr != NULL;