Merge remote-tracking branch 'RT-Thread/master'

fb27e822 · Wenlong.Fan · 7db820fb · 437b0da9 · fb27e822
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

src/clock.c src/clock.c +3 -3

未找到文件。
--- a/src/clock.c
+++ b/src/clock.c
@@ -112,13 +112,13 @@ rt_tick_t rt_tick_from_millisecond(rt_int32_t ms)
    rt_tick_t tick;
    if (ms < 0)
-    {    
+    {
-        tick = RT_WAITING_FOREVER;
+        tick = (rt_tick_t)RT_WAITING_FOREVER;
    }
    else
    {
        tick = RT_TICK_PER_SECOND * (ms / 1000);
-        tick += (RT_TICK_PER_SECOND * (ms%1000) + 999) / 1000;
+        tick += (RT_TICK_PER_SECOND * (ms % 1000) + 999) / 1000;
    }
    /* return the calculated tick */