| Andrew Geissler | 78b7279 | 2022-06-14 06:47:25 -0500 | [diff] [blame^] | 1 | From 490f5b6cd788692d989f07180a5714c76872911e Mon Sep 17 00:00:00 2001 |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 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> |
| Andrew Geissler | 78b7279 | 2022-06-14 06:47:25 -0500 | [diff] [blame^] | 13 | |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 14 | --- |
| Andrew Geissler | 78b7279 | 2022-06-14 06:47:25 -0500 | [diff] [blame^] | 15 | evtest.c | 5 +++++ |
| 16 | 1 file changed, 5 insertions(+) |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 17 | |
| 18 | diff --git a/evtest.c b/evtest.c |
| Andrew Geissler | 78b7279 | 2022-06-14 06:47:25 -0500 | [diff] [blame^] | 19 | index ba7a161..8fc2e5a 100644 |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 20 | --- a/evtest.c |
| 21 | +++ b/evtest.c |
| Andrew Geissler | 78b7279 | 2022-06-14 06:47:25 -0500 | [diff] [blame^] | 22 | @@ -63,6 +63,11 @@ |
| 23 | #define input_event_usec time.tv_usec |
| 24 | #endif |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 25 | |
| 26 | +#ifndef input_event_sec |
| 27 | +#define input_event_sec time.tv_sec |
| 28 | +#define input_event_usec time.tv_usec |
| 29 | +#endif |
| 30 | + |
| 31 | #define BITS_PER_LONG (sizeof(long) * 8) |
| 32 | #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) |
| 33 | #define OFF(x) ((x)%BITS_PER_LONG) |