| From 70c5dd9e858ed577a4bbe7ec8920934c89df08fc Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Sat, 30 Nov 2019 11:58:58 -0800 |
| Subject: [PATCH] Fix build on 32bit arches with 64bit time_t |
| |
| time element is deprecated on new input_event structure in kernel's |
| input.h [1] |
| |
| [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| Signed-off-by: Baruch Siach <baruch@tkos.co.il> |
| --- |
| Upstream status: commit 648f5c1a9e0 |
| |
| evtest.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| diff --git a/evtest.c b/evtest.c |
| index 548c203564d3..8d592f42bdca 100644 |
| --- a/evtest.c |
| +++ b/evtest.c |
| @@ -61,6 +61,11 @@ |
| #include <sys/types.h> |
| #include <unistd.h> |
| |
| +#ifndef input_event_sec |
| +#define input_event_sec time.tv_sec |
| +#define input_event_usec time.tv_usec |
| +#endif |
| + |
| #define BITS_PER_LONG (sizeof(long) * 8) |
| #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) |
| #define OFF(x) ((x)%BITS_PER_LONG) |
| @@ -1140,7 +1145,7 @@ static int print_events(int fd) |
| type = ev[i].type; |
| code = ev[i].code; |
| |
| - printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec); |
| + printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_usec); |
| |
| if (type == EV_SYN) { |
| if (code == SYN_MT_REPORT) |
| -- |
| 2.25.1 |
| |
