Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 1 | From fa57c78c33d26084f85f1a6b4c29378631dc9395 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 30 Nov 2019 11:58:58 -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 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6] |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | evtest.c | 7 ++++++- |
| 15 | 1 file changed, 6 insertions(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/evtest.c b/evtest.c |
| 18 | index 548c203..93063cd 100644 |
| 19 | --- a/evtest.c |
| 20 | +++ b/evtest.c |
| 21 | @@ -61,6 +61,11 @@ |
| 22 | #include <sys/types.h> |
| 23 | #include <unistd.h> |
| 24 | |
| 25 | +#ifndef input_event_sec |
| 26 | +#define input_event_sec time.tv_sec |
| 27 | +#define input_event_usec time.tv_usec |
| 28 | +#endif |
| 29 | + |
| 30 | #define BITS_PER_LONG (sizeof(long) * 8) |
| 31 | #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) |
| 32 | #define OFF(x) ((x)%BITS_PER_LONG) |
| 33 | @@ -1140,7 +1145,7 @@ static int print_events(int fd) |
| 34 | type = ev[i].type; |
| 35 | code = ev[i].code; |
| 36 | |
| 37 | - printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec); |
| 38 | + printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_sec); |
| 39 | |
| 40 | if (type == EV_SYN) { |
| 41 | if (code == SYN_MT_REPORT) |