fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-07 13:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

util: fix remaininig usec computation on 32 bits

Browse source 
Follow-up from commit dcbfbc4cf1 ("util: fix usec computation on 32 bits")
which didn't fix all instances, make this consistent.

Fixes: dcbfbc4cf1 ("util: fix usec computation on 32 bits")
(cherry picked from commit 166201d9fc)

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1468>
This commit is contained in:
Peter Hutterer 2026-03-22 18:24:16 +10:00
parent 6d39bd5297
commit ccc8d60204
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/util-time.h
View file

@ -47,13 +47,13 @@ usec_from_millis(uint32_t millis)
static inline usec_t static inline usec_t
usec_from_seconds(uint32_t secs) usec_from_seconds(uint32_t secs)
{ {
return usec_from_millis(secs * 1000); return usec_from_uint64_t(secs * 1000000ULL);
} }
static inline usec_t static inline usec_t
usec_from_hours(uint32_t hours) usec_from_hours(uint32_t hours)
{ {
return usec_from_seconds(hours * 3600); return usec_from_uint64_t((uint64_t)hours * 3600 * 1000000ULL);
} }
static inline uint32_t static inline uint32_t
@ -83,7 +83,7 @@ usec_to_hours(usec_t us)
static inline usec_t static inline usec_t
usec_add_millis(usec_t us, uint32_t millis) usec_add_millis(usec_t us, uint32_t millis)
{ {
return usec_from_uint64_t(usec_as_uint64_t(us) + millis * 1000); return usec_from_uint64_t(usec_as_uint64_t(us) + millis * 1000ULL);
} }
static inline usec_t static inline usec_t