0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From fa57c78c33d26084f85f1a6b4c29378631dc9395 Mon Sep 17 00:00:00 2001
  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. time element is deprecated on new input_event structure in kernel's
  6. input.h [1]
  7. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
  8. Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6]
  9. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  10. ---
  11. evtest.c | 7 ++++++-
  12. 1 file changed, 6 insertions(+), 1 deletion(-)
  13. diff --git a/evtest.c b/evtest.c
  14. index 548c203..93063cd 100644
  15. --- a/evtest.c
  16. +++ b/evtest.c
  17. @@ -61,6 +61,11 @@
  18. #include <sys/types.h>
  19. #include <unistd.h>
  20. +#ifndef input_event_sec
  21. +#define input_event_sec time.tv_sec
  22. +#define input_event_usec time.tv_usec
  23. +#endif
  24. +
  25. #define BITS_PER_LONG (sizeof(long) * 8)
  26. #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
  27. #define OFF(x) ((x)%BITS_PER_LONG)
  28. @@ -1140,7 +1145,7 @@ static int print_events(int fd)
  29. type = ev[i].type;
  30. code = ev[i].code;
  31. - printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec);
  32. + printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_sec);
  33. if (type == EV_SYN) {
  34. if (code == SYN_MT_REPORT)