diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-06-10 18:41:19 +0200 |
|---|---|---|
| committer | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-06-10 18:42:22 +0200 |
| commit | fbfb16edfe886f9ff2e6962c306645442f31d867 (patch) | |
| tree | 761d96d07f6465b1f460ef26e2b3bb9acc36003a | |
| parent | 409e8205e8a49423056d5a1b09c128e882a6102a (diff) | |
tolerate including linux/input.h
On some platforms (eg. FreeBSD) we're running into a name clash between
xf86str.h and linux/input.h. Since we don't actually need those symbols
here, an easy workaround is #undef'ing them.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/merge_requests/6>
| -rw-r--r-- | src/evdev.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/evdev.h b/src/evdev.h index 0bc81ff..ce21ec3 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -38,6 +38,13 @@ #include <linux/input.h> #include <sys/types.h> +/* Tolerate prior #include <linux/input.h> */ +#undef BUS_NONE +#undef BUS_PCI +#undef BUS_SBUS +#undef BUS_PLATFORM +#undef BUS_USB + #include <xorg-server.h> #include <xf86Xinput.h> #include <xf86_OSproc.h> |