summaryrefslogtreecommitdiff
path: root/libutils/Timers.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libutils/Timers.cpp')
-rw-r--r--libutils/Timers.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/libutils/Timers.cpp b/libutils/Timers.cpp
index 201bc412c..b2df9a58f 100644
--- a/libutils/Timers.cpp
+++ b/libutils/Timers.cpp
@@ -20,7 +20,6 @@
#include <utils/Timers.h>
#include <limits.h>
-#include <sys/time.h>
#include <time.h>
#if defined(__ANDROID__)
@@ -53,7 +52,7 @@ nsecs_t systemTime(int /*clock*/)
int toMillisecondTimeoutDelay(nsecs_t referenceTime, nsecs_t timeoutTime)
{
- int timeoutDelayMillis;
+ nsecs_t timeoutDelayMillis;
if (timeoutTime > referenceTime) {
uint64_t timeoutDelay = uint64_t(timeoutTime - referenceTime);
if (timeoutDelay > uint64_t((INT_MAX - 1) * 1000000LL)) {
@@ -64,5 +63,5 @@ int toMillisecondTimeoutDelay(nsecs_t referenceTime, nsecs_t timeoutTime)
} else {
timeoutDelayMillis = 0;
}
- return timeoutDelayMillis;
+ return (int)timeoutDelayMillis;
}