mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2026-03-21 13:20:42 +01:00
Merge branch 'time32' into 'main'
Fix timerfd_settime Invalid argument for 32 bits cpu See merge request libinput/libinput!1446
This commit is contained in:
commit
a1345bf98b
1 changed files with 3 additions and 3 deletions
|
|
@ -41,7 +41,7 @@ DECLARE_NEWTYPE(usec, uint64_t);
|
|||
static inline usec_t
|
||||
usec_from_millis(uint32_t millis)
|
||||
{
|
||||
return usec_from_uint64_t(millis * 1000);
|
||||
return usec_from_uint64_t(millis * 1000ULL);
|
||||
}
|
||||
|
||||
static inline usec_t
|
||||
|
|
@ -101,13 +101,13 @@ us2ms_f(usec_t us)
|
|||
static inline usec_t
|
||||
usec_from_timeval(const struct timeval *tv)
|
||||
{
|
||||
return usec_from_uint64_t(tv->tv_sec * 1000000 + tv->tv_usec);
|
||||
return usec_from_uint64_t(tv->tv_sec * 1000000ULL + tv->tv_usec);
|
||||
}
|
||||
|
||||
static inline usec_t
|
||||
usec_from_timespec(const struct timespec *tp)
|
||||
{
|
||||
return usec_from_uint64_t(tp->tv_sec * 1000000 + tp->tv_nsec / 1000);
|
||||
return usec_from_uint64_t(tp->tv_sec * 1000000ULL + tp->tv_nsec / 1000);
|
||||
}
|
||||
|
||||
static inline usec_t
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue