diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-05-02 10:56:25 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-05-02 10:56:25 +0000 |
| commit | cb56bbe430307bd8254907d417cb576384f47d19 (patch) | |
| tree | 1118779203d6874d0a1e1152a2f6121c7208b047 | |
| parent | 8fc72c902d9c471a27c9fb7128115830d63f055a (diff) | |
| parent | a9f0704ae1a8ac2a5e7086d8bd8c62aa2e93fb27 (diff) | |
| download | gtk+-cb56bbe430307bd8254907d417cb576384f47d19.tar.gz | |
Merge branch 'wip/lantw/gtk3-use-dev-evdev-input-h-on-freebsd' into 'gtk-3-22'
wayland: Use dev/evdev/input.h on FreeBSD (GTK3)
See merge request GNOME/gtk!132
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | gdk/wayland/gdkdevice-wayland.c | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 023a86fb17..05843eda14 100644 --- a/configure.ac +++ b/configure.ac @@ -819,7 +819,13 @@ LIBS=$gtk_save_LIBS AC_CHECK_HEADERS(linux/memfd.h, AC_DEFINE(HAVE_LINUX_MEMFD_H, 1, - [Define to 1 if memfd.h is available])) + [Define to 1 if linux/memfd.h is available])) +AC_CHECK_HEADERS(linux/input.h, + AC_DEFINE(HAVE_LINUX_INPUT_H, 1, + [Define to 1 if linux/input.h is available])) +AC_CHECK_HEADERS(dev/evdev/input.h, + AC_DEFINE(HAVE_DEV_EVDEV_INPUT_H, 1, + [Define to 1 if dev/evdev/input.h is available])) AC_CHECK_HEADERS(sys/mman.h, AC_DEFINE(HAVE_SYS_MMAN_H, 1, [Define to 1 if mman.h is available])) diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index ee2fbd3dc6..d17b5510b8 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -38,11 +38,13 @@ #include <xkbcommon/xkbcommon.h> -#include <linux/input.h> - #include <sys/time.h> #include <sys/mman.h> +#if defined(HAVE_DEV_EVDEV_INPUT_H) +#include <dev/evdev/input.h> +#elif defined(HAVE_LINUX_INPUT_H) #include <linux/input.h> +#endif #define BUTTON_BASE (BTN_LEFT - 1) /* Used to translate to 1-indexed buttons */ |