[PATCH:xf86-input-joystick] Adapt to USB HID header changes on NetBSD-8.99.9.

Thomas Klausner wiz at NetBSD.org
Wed Dec 27 14:18:49 UTC 2017


From: Manuel Bouyer <bouyer at NetBSD.org>

Signed-off-by: Thomas Klausner <wiz at NetBSD.org>
---
 configure.ac      | 1 +
 src/backend_bsd.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/configure.ac b/configure.ac
index 40475dc..4877f57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,6 +100,7 @@ AC_CHECK_HEADERS([usbhid.h dev/usb/usbhid.h],, [bsd_backend=no],
 #include <dev/usb/usb.h>
 #endif
 ]])
+AC_CHECK_HEADERS([dev/hid/hid.h])
 AC_CHECK_LIB([usbhid],[hid_get_item],, [bsd_backend=no])
 AM_CONDITIONAL(BSD_BACKEND, [test "x$bsd_backend" = xyes])
 if test "x$bsd_backend" = xyes; then
diff --git a/src/backend_bsd.c b/src/backend_bsd.c
index d8c6bac..302b057 100644
--- a/src/backend_bsd.c
+++ b/src/backend_bsd.c
@@ -44,6 +44,9 @@
 #include <usbhid.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
+#ifdef HAVE_DEV_HID_HID_H
+    #include <dev/hid/hid.h>
+#endif
 #ifdef HAVE_DEV_USB_USB_IOCTL_H
     #include <dev/usb/usb_ioctl.h>
 #endif
-- 
2.15.1



More information about the xorg-devel mailing list