1From 70c5dd9e858ed577a4bbe7ec8920934c89df08fc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Nov 2019 11:58:58 -0800
4Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
5
6time element is deprecated on new input_event structure in kernel's
7input.h [1]
8
9[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Baruch Siach <baruch@tkos.co.il>
13---
14Upstream status: commit 648f5c1a9e0
15
16 evtest.c | 7 ++++++-
17 1 file changed, 6 insertions(+), 1 deletion(-)
18
19diff --git a/evtest.c b/evtest.c
20index 548c203564d3..8d592f42bdca 100644
21--- a/evtest.c
22+++ b/evtest.c
23@@ -61,6 +61,11 @@
24 #include <sys/types.h>
25 #include <unistd.h>
26
27+#ifndef input_event_sec
28+#define input_event_sec time.tv_sec
29+#define input_event_usec time.tv_usec
30+#endif
31+
32 #define BITS_PER_LONG (sizeof(long) * 8)
33 #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
34 #define OFF(x)  ((x)%BITS_PER_LONG)
35@@ -1140,7 +1145,7 @@ static int print_events(int fd)
36 			type = ev[i].type;
37 			code = ev[i].code;
38
39-			printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec);
40+			printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_usec);
41
42 			if (type == EV_SYN) {
43 				if (code == SYN_MT_REPORT)
44--
452.25.1
46
47