45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
|
Upstream: yes, https://gitlab.freedesktop.org/libevdev/evtest/-/commit/648f5c1a9e07843e185782d207bc1bcbe6586f6e
|
||
|
|
From 648f5c1a9e07843e185782d207bc1bcbe6586f6e 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>
|
||
|
|
---
|
||
|
|
evtest.c | 7 ++++++-
|
||
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/evtest.c b/evtest.c
|
||
|
|
index be5e42c..d00437f 100644
|
||
|
|
--- a/evtest.c
|
||
|
|
+++ b/evtest.c
|
||
|
|
@@ -62,6 +62,11 @@
|
||
|
|
#include <unistd.h>
|
||
|
|
#include <limits.h> /* PATH_MAX */
|
||
|
|
|
||
|
|
+#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)
|
||
|
|
@@ -1141,7 +1146,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.20.1
|
||
|
|
|