diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-03-15 13:40:40 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-03-15 13:40:40 (GMT) |
| commit | 26e714137a987c67af5a932fdaf7bd1138d97a2d (patch) | |
| tree | 9358f84805ded45680d28bba41db129dfafb91e2 /generic/tclTimer.c | |
| parent | a457b16dfc3bd4a4db9171364cd2a5ab04392bb8 (diff) | |
| parent | aa199edba612a516e6309290fb6dc4442a49a5ee (diff) | |
| download | tcl-26e714137a987c67af5a932fdaf7bd1138d97a2d.zip tcl-26e714137a987c67af5a932fdaf7bd1138d97a2d.tar.gz tcl-26e714137a987c67af5a932fdaf7bd1138d97a2d.tar.bz2 | |
merge 8.7
Diffstat (limited to 'generic/tclTimer.c')
| -rw-r--r-- | generic/tclTimer.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/generic/tclTimer.c b/generic/tclTimer.c index 6d3938b..54854d0 100644 --- a/generic/tclTimer.c +++ b/generic/tclTimer.c @@ -819,9 +819,6 @@ Tcl_AfterObjCmd( */ if (objv[1]->typePtr == &tclIntType -#ifndef TCL_WIDE_INT_IS_LONG - || objv[1]->typePtr == &tclWideIntType -#endif || objv[1]->typePtr == &tclBignumType || (Tcl_GetIndexFromObj(NULL, objv[1], afterSubCmds, "", 0, &index) != TCL_OK)) { @@ -1045,31 +1042,27 @@ AfterDelay( if (iPtr->limit.timeEvent == NULL || TCL_TIME_BEFORE(endTime, iPtr->limit.time)) { diff = TCL_TIME_DIFF_MS_CEILING(endTime, now); -#ifndef TCL_WIDE_INT_IS_LONG - if (diff > LONG_MAX) { - diff = LONG_MAX; - } -#endif if (diff > TCL_TIME_MAXIMUM_SLICE) { diff = TCL_TIME_MAXIMUM_SLICE; } - if (diff == 0 && TCL_TIME_BEFORE(now, endTime)) diff = 1; + if (diff == 0 && TCL_TIME_BEFORE(now, endTime)) { + diff = 1; + } if (diff > 0) { - Tcl_Sleep((long) diff); - if (diff < SLEEP_OFFLOAD_GETTIMEOFDAY) break; - } else break; + Tcl_Sleep((int) diff); + if (diff < SLEEP_OFFLOAD_GETTIMEOFDAY) { + break; + } + } else { + break; + } } else { diff = TCL_TIME_DIFF_MS(iPtr->limit.time, now); -#ifndef TCL_WIDE_INT_IS_LONG - if (diff > LONG_MAX) { - diff = LONG_MAX; - } -#endif if (diff > TCL_TIME_MAXIMUM_SLICE) { diff = TCL_TIME_MAXIMUM_SLICE; } if (diff > 0) { - Tcl_Sleep((long) diff); + Tcl_Sleep((int) diff); } if (Tcl_AsyncReady()) { if (Tcl_AsyncInvoke(interp, TCL_OK) != TCL_OK) { @@ -1083,7 +1076,7 @@ AfterDelay( return TCL_ERROR; } } - Tcl_GetTime(&now); + Tcl_GetTime(&now); } while (TCL_TIME_BEFORE(now, endTime)); return TCL_OK; } |