summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2019-03-27 20:37:07 +0800
committerGitHub <[email protected]>2019-03-27 20:37:07 +0800
commit437b0da91ec22b4feeb17b5fc9d53a35e179bd49 (patch)
tree2b0fd728ba7a5a83069d0ab3129a1d8aa247735c
parentd7f849c8799a2887c143f881010e3fe64a1fba46 (diff)
parentaa3295d7f00bdab3788ea8281ed4a305b1614c13 (diff)
Merge pull request #2518 from ErnestChen1/master
[src/clock.c] avoid warning
-rw-r--r--src/clock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/clock.c b/src/clock.c
index 5fcd1d4ae4..a652282b6e 100644
--- 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 */