1*4882a593SmuzhiyunFrom bcf1d52853fc5e603ff4bca3495f860e81994108 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Sat, 30 Nov 2019 10:07:43 -0800 4*4882a593SmuzhiyunSubject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t 5*4882a593Smuzhiyun 6*4882a593Smuzhiyuntime element is deprecated on new input_event structure in kernel's 7*4882a593Smuzhiyuninput.h [1] 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunUpstream-Status: Pending 12*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 13*4882a593SmuzhiyunSigned-off-by: Martin Jansa <Martin.Jansa@gmail.com> 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun chromium/ui/events/ozone/evdev/event_converter_evdev.h | 5 +++++ 16*4882a593Smuzhiyun chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 3 +-- 17*4882a593Smuzhiyun 2 files changed, 6 insertions(+), 2 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h 20*4882a593Smuzhiyunindex 2d184811a00..fb2ba0069f1 100644 21*4882a593Smuzhiyun--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h 22*4882a593Smuzhiyun+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h 23*4882a593Smuzhiyun@@ -20,6 +20,11 @@ 24*4882a593Smuzhiyun #include "ui/events/ozone/evdev/event_dispatch_callback.h" 25*4882a593Smuzhiyun #include "ui/gfx/geometry/size.h" 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun+#ifndef input_event_sec 28*4882a593Smuzhiyun+#define input_event_sec time.tv_sec 29*4882a593Smuzhiyun+#define input_event_usec time.tv_usec 30*4882a593Smuzhiyun+#endif 31*4882a593Smuzhiyun+ 32*4882a593Smuzhiyun struct input_event; 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun namespace ui { 35*4882a593Smuzhiyundiff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc 36*4882a593Smuzhiyunindex b8d089f7381..5d2d08b1ec6 100644 37*4882a593Smuzhiyun--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc 38*4882a593Smuzhiyun+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc 39*4882a593Smuzhiyun@@ -62,8 +62,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { 40*4882a593Smuzhiyun continue; 41*4882a593Smuzhiyun std::string event_string = base::StringPrintf( 42*4882a593Smuzhiyun "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, 43*4882a593Smuzhiyun- te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, 44*4882a593Smuzhiyun- te->slot); 45*4882a593Smuzhiyun+ te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); 46*4882a593Smuzhiyun report_content += event_string; 47*4882a593Smuzhiyun } 48*4882a593Smuzhiyun file.Write(0, report_content.c_str(), report_content.length()); 49