Skip to contentSkip to conversation

keytable: use input_event properly

PATCH In review Rosen Penev 2 participants 2 messages Mar 30, 2020 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 keytable: use input_event properly

It does not use time_t under musl when time_t is 64-bit. The struct has compatibility defines. Instead of using time_t directly, use those defines.

Fixes compilation under musl 1.2.0 under 32-bit OSes.

---
 utils/keytable/keytable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
utils/keytable/keytable.c +1 -1
index aad993ea..bc890394 100644
@@ -1551,7 +1551,7 @@ static void test_event(struct rc_device *rc_dev, int fd)
 
 		for (i = 0; i < rd / sizeof(struct input_event); i++) {
 			printf(_("%ld.%06ld: event type %s(0x%02x)"),
-				ev[i].time.tv_sec, ev[i].time.tv_usec,
+				ev[i].input_event_sec, ev[i].input_event_usec,
 				get_event_name(events_type, ev[i].type), ev[i].type);
 
 			switch (ev[i].type) {
Signature · 1 line
2.25.1
#1 lore raw
Quoted 5 lines · Rosen Penev

It does not use time_t under musl when time_t is 64-bit. The struct has compatibility defines. Instead of using time_t directly, use those defines.

Fixes compilation under musl 1.2.0 under 32-bit OSes.

Looks good, merged.

Thanks,

Sean

Quoted 21 lines
---
 utils/keytable/keytable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
utils/keytable/keytable.c +1 -1
index aad993ea..bc890394 100644
@@ -1551,7 +1551,7 @@ static void test_event(struct rc_device *rc_dev, int fd)
 
 		for (i = 0; i < rd / sizeof(struct input_event); i++) {
 			printf(_("%ld.%06ld: event type %s(0x%02x)"),
-				ev[i].time.tv_sec, ev[i].time.tv_usec,
+				ev[i].input_event_sec, ev[i].input_event_usec,
 				get_event_name(events_type, ev[i].type), ev[i].type);
 
 			switch (ev[i].type) {
Signature · 1 line
2.25.1