diff options
| author | dgp <dgp@users.sourceforge.net> | 2019-12-06 16:02:01 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2019-12-06 16:02:01 (GMT) |
| commit | f3b259c158113e3132e8ef636a60d4b2cd852b60 (patch) | |
| tree | 6b85b7b0343410a79bce54c7f0a2e84f376e71ae | |
| parent | 8ed389c37a4e2b151412b9b3b7b5308cb73a6a66 (diff) | |
| parent | 5aef84d1f4ff017e3debb4a78d85fdc332793dc2 (diff) | |
| download | tcl-f3b259c158113e3132e8ef636a60d4b2cd852b60.zip tcl-f3b259c158113e3132e8ef636a60d4b2cd852b60.tar.gz tcl-f3b259c158113e3132e8ef636a60d4b2cd852b60.tar.bz2 | |
merge 8.7
| -rw-r--r-- | generic/tclEncoding.c | 4 | ||||
| -rw-r--r-- | generic/tclTimer.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 93c0250..2f79c05 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 c195f08..5451614 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; |