Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame^] | 1 | From 50a48a7bd8d65a165ce2aac4ba0c1e02bded04aa Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 30 Nov 2019 12:21:31 -0800 |
| 4 | Subject: [PATCH] Fix build on 32bit arches with 64bit time_t |
| 5 | |
| 6 | time element is deprecated on new input_event structure in kernel's |
| 7 | input.h [1] |
| 8 | |
| 9 | [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f |
| 10 | |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | plugins/devinput.c | 7 ++++++- |
| 14 | 1 file changed, 6 insertions(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/plugins/devinput.c b/plugins/devinput.c |
| 17 | index d4d733a..feb4a61 100644 |
| 18 | --- a/plugins/devinput.c |
| 19 | +++ b/plugins/devinput.c |
| 20 | @@ -34,6 +34,11 @@ |
| 21 | #include <linux/uinput.h> |
| 22 | #include <sys/stat.h> |
| 23 | |
| 24 | +#ifndef input_event_sec |
| 25 | +#define input_event_sec time.tv_sec |
| 26 | +#define input_event_usec time.tv_usec |
| 27 | +#endif |
| 28 | + |
| 29 | #ifndef EV_SYN |
| 30 | /* previous name */ |
| 31 | #define EV_SYN EV_RST |
| 32 | @@ -459,7 +464,7 @@ char* devinput_rec(struct ir_remote* remotes) |
| 33 | return 0; |
| 34 | } |
| 35 | |
| 36 | - log_trace("time %ld.%06ld type %d code %d value %d", event.time.tv_sec, event.time.tv_usec, event.type, |
| 37 | + log_trace("time %ld.%06ld type %d code %d value %d", event.input_event_sec, event.input_event_usec, event.type, |
| 38 | event.code, event.value); |
| 39 | |
| 40 | value = (unsigned)event.value; |