vanhofen
3 years ago
3 changed files with 1 additions and 85 deletions
@ -1,38 +0,0 @@ |
|||||
From 7d7c5a81b0e2f3321d269b7acc450d1eec7a910b Mon Sep 17 00:00:00 2001 |
|
||||
From: Baruch Siach <baruch@tkos.co.il> |
|
||||
Date: Sun, 18 Aug 2019 09:57:23 +0300 |
|
||||
Subject: [PATCH] Add missing limits.h include |
|
||||
MIME-Version: 1.0 |
|
||||
Content-Type: text/plain; charset=UTF-8 |
|
||||
Content-Transfer-Encoding: 8bit |
|
||||
|
|
||||
Fixes build with musl libc that does not include limits.h indirectly via |
|
||||
other headers. |
|
||||
|
|
||||
evtest.c: In function ‘scan_devices’: |
|
||||
evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean INT8_MAX’? |
|
||||
char fname[PATH_MAX]; |
|
||||
^~~~~~~~ |
|
||||
|
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il> |
|
||||
---
|
|
||||
Upstream status: sent to input-tools@lists.freedesktop.org (moderated) |
|
||||
|
|
||||
evtest.c | 1 + |
|
||||
1 file changed, 1 insertion(+) |
|
||||
|
|
||||
diff --git a/evtest.c b/evtest.c
|
|
||||
index 37d4f8540333..548c203564d3 100644
|
|
||||
--- a/evtest.c
|
|
||||
+++ b/evtest.c
|
|
||||
@@ -56,6 +56,7 @@
|
|
||||
#include <getopt.h> |
|
||||
#include <ctype.h> |
|
||||
#include <signal.h> |
|
||||
+#include <limits.h>
|
|
||||
#include <sys/time.h> |
|
||||
#include <sys/types.h> |
|
||||
#include <unistd.h> |
|
||||
--
|
|
||||
2.23.0.rc1 |
|
||||
|
|
@ -1,46 +0,0 @@ |
|||||
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 |
|
||||
|
|
Loading…
Reference in new issue