diff options
| author | sebres <sebres@users.sourceforge.net> | 2019-01-28 16:19:27 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2019-01-28 16:19:27 (GMT) |
| commit | 4247e597c6de977b80205b4c28784465ee05f941 (patch) | |
| tree | 5fd8a47922373642e11bf409d5f5fba4448ea67c | |
| parent | a6393381ec5d16f9f82c4b8ee992bedaa7c1e4a9 (diff) | |
| parent | 3621a3fd746ab2556b36d1250cda4a1ab13529b7 (diff) | |
| download | tcl-4247e597c6de977b80205b4c28784465ee05f941.zip tcl-4247e597c6de977b80205b4c28784465ee05f941.tar.gz tcl-4247e597c6de977b80205b4c28784465ee05f941.tar.bz2 | |
merge 8.6 ([4ee9b4f3e965a7da5133] was already fixed in 8.7, so no functional changes here)
| -rw-r--r-- | generic/tclCmdMZ.c | 2 | ||||
| -rw-r--r-- | generic/tclIntDecls.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c index 6cb80f1..ab46d52 100644 --- a/generic/tclCmdMZ.c +++ b/generic/tclCmdMZ.c @@ -4049,7 +4049,7 @@ Tcl_TimeObjCmd( * Use int obj since we know time is not fractional. [Bug 1202178] */ - objs[0] = Tcl_NewWideIntObj((count <= 0) ? 0 : (Tcl_WideInt) totalMicroSec); + objs[0] = Tcl_NewWideIntObj((count <= 0) ? 0 : (Tcl_WideInt)totalMicroSec); } else { objs[0] = Tcl_NewDoubleObj(totalMicroSec/count); } diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index 7131ce8..eddbcb3 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -15,7 +15,6 @@ #ifndef _TCLINTDECLS #define _TCLINTDECLS -#include "tclPort.h" #undef TCL_STORAGE_CLASS #ifdef BUILD_tcl |