From fd204f628021c9bb13870a8c983d9c63e1a53ebb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 23 Mar 2020 11:04:11 +0100 Subject: [PATCH] src/evemu.c: fix build with kernels >= 4.16 Commit 30973c0b forgot to update all occurences of input_event, this will result in the following build failure with kernel >= 4.16: evemu.c: In function 'write_event_desc': evemu.c:753:23: error: 'const struct input_event' has no member named 'time'; did you mean 'type'? time = millis(&ev->time); ^~~~ type Fixes: - http://autobuild.buildroot.org/results/487dd5056ec0a977d55b23417d5db2664dcc91fa Signed-off-by: Fabrice Fontaine [Retrieved from: https://gitlab.freedesktop.org/libevdev/evemu/-/commit/fd204f628021c9bb13870a8c983d9c63e1a53ebb] --- src/evemu.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/evemu.c b/src/evemu.c index c7ff561..42dbe1d 100644 --- a/src/evemu.c +++ b/src/evemu.c @@ -733,11 +733,6 @@ out: return rc; } -static inline unsigned long millis(const struct timeval *tv) -{ - return tv->tv_sec * 1000 + tv->tv_usec/1000; -} - static int write_event_desc(FILE *fp, const struct input_event *ev) { int rc; @@ -750,7 +745,7 @@ static int write_event_desc(FILE *fp, const struct input_event *ev) libevdev_event_code_get_name(ev->type, ev->code), ev->value); } else { - time = millis(&ev->time); + time = ev->input_event_sec * 1000 + ev->input_event_usec/1000; dt = time - last_ms; last_ms = time; rc = fprintf(fp, "# ------------ %s (%d) ---------- %+ldms\n", -- 2.24.1