1*4882a593SmuzhiyunFrom fd204f628021c9bb13870a8c983d9c63e1a53ebb Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 23 Mar 2020 11:04:11 +0100 4*4882a593SmuzhiyunSubject: [PATCH] src/evemu.c: fix build with kernels >= 4.16 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunCommit 30973c0b forgot to update all occurences of input_event, this 7*4882a593Smuzhiyunwill result in the following build failure with kernel >= 4.16: 8*4882a593Smuzhiyun 9*4882a593Smuzhiyunevemu.c: In function 'write_event_desc': 10*4882a593Smuzhiyunevemu.c:753:23: error: 'const struct input_event' has no member named 'time'; did you mean 'type'? 11*4882a593Smuzhiyun time = millis(&ev->time); 12*4882a593Smuzhiyun ^~~~ 13*4882a593Smuzhiyun type 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunFixes: 16*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/487dd5056ec0a977d55b23417d5db2664dcc91fa 17*4882a593Smuzhiyun 18*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 19*4882a593Smuzhiyun[Retrieved from: 20*4882a593Smuzhiyunhttps://gitlab.freedesktop.org/libevdev/evemu/-/commit/fd204f628021c9bb13870a8c983d9c63e1a53ebb] 21*4882a593Smuzhiyun--- 22*4882a593Smuzhiyun src/evemu.c | 7 +------ 23*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 6 deletions(-) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/src/evemu.c b/src/evemu.c 26*4882a593Smuzhiyunindex c7ff561..42dbe1d 100644 27*4882a593Smuzhiyun--- a/src/evemu.c 28*4882a593Smuzhiyun+++ b/src/evemu.c 29*4882a593Smuzhiyun@@ -733,11 +733,6 @@ out: 30*4882a593Smuzhiyun return rc; 31*4882a593Smuzhiyun } 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun-static inline unsigned long millis(const struct timeval *tv) 34*4882a593Smuzhiyun-{ 35*4882a593Smuzhiyun- return tv->tv_sec * 1000 + tv->tv_usec/1000; 36*4882a593Smuzhiyun-} 37*4882a593Smuzhiyun- 38*4882a593Smuzhiyun static int write_event_desc(FILE *fp, const struct input_event *ev) 39*4882a593Smuzhiyun { 40*4882a593Smuzhiyun int rc; 41*4882a593Smuzhiyun@@ -750,7 +745,7 @@ static int write_event_desc(FILE *fp, const struct input_event *ev) 42*4882a593Smuzhiyun libevdev_event_code_get_name(ev->type, ev->code), 43*4882a593Smuzhiyun ev->value); 44*4882a593Smuzhiyun } else { 45*4882a593Smuzhiyun- time = millis(&ev->time); 46*4882a593Smuzhiyun+ time = ev->input_event_sec * 1000 + ev->input_event_usec/1000; 47*4882a593Smuzhiyun dt = time - last_ms; 48*4882a593Smuzhiyun last_ms = time; 49*4882a593Smuzhiyun rc = fprintf(fp, "# ------------ %s (%d) ---------- %+ldms\n", 50*4882a593Smuzhiyun-- 51*4882a593Smuzhiyun2.24.1 52*4882a593Smuzhiyun 53