diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/kernel/qcore_unix_p.h | 8 | ||||
-rw-r--r-- | src/corelib/kernel/qeventdispatcher_unix.cpp | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index 00ec4af203..e7259d29c9 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -101,13 +101,13 @@ QT_BEGIN_NAMESPACE // Internal operator functions for timevals inline timeval &normalizedTimeval(timeval &t) { - while (t.tv_usec > 1000000l) { + while (t.tv_usec >= 1000000) { ++t.tv_sec; - t.tv_usec -= 1000000l; + t.tv_usec -= 1000000; } - while (t.tv_usec < 0l) { + while (t.tv_usec < 0) { --t.tv_sec; - t.tv_usec += 1000000l; + t.tv_usec += 1000000; } return t; } diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 3c7a48ac68..27efac6985 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -448,11 +448,7 @@ static timeval roundToMillisecond(timeval val) int us = val.tv_usec % 1000; val.tv_usec += 1000 - us; - if (val.tv_usec > 1000000) { - val.tv_usec -= 1000000; - ++val.tv_sec; - } - return val; + return normalizedTimeval(val); } /* |