XLibre/xf86-input-joystick
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-joystick.git synced 2026-03-24 01:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix FTBS on FreeBSD

Browse Source 
Work around name clash between linux/input.h and xf86str.h

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-joystick/-/merge_requests/7>
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-06-04 13:26:21 +02:00
parent 06a4edcea3
commit 5f6820549b
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend_evdev.c
View File

@@ -29,6 +29,16 @@
#include "config.h"
#endif
#include <linux/input.h>
/* workaround for name clash between linux/input.h and xf86str.h */
#undef BUS_NONE
#undef BUS_PCI
#undef BUS_SBUS
#undef BUS_PLATFORM
#undef BUS_USB
#undef BUS_last
#include <xorg-server.h>
#include <unistd.h>
#include <sys/types.h>
@@ -37,7 +47,6 @@
#include <errno.h>
#include <string.h>
#include <stdlib.h>
#include <linux/input.h>
#include <xf86.h>
#include <xf86_OSproc.h>

11
src/backend_joystick.c
View File

@@ -32,6 +32,16 @@
#include "config.h"
#endif
#include <linux/joystick.h>
/* workaround for name clash between joystick.h and xf86str.h */
#undef BUS_NONE
#undef BUS_PCI
#undef BUS_SBUS
#undef BUS_PLATFORM
#undef BUS_USB
#undef BUS_last
#include <xorg-server.h>
#include <unistd.h>
#include <sys/types.h>
@@ -40,7 +50,6 @@
#include <errno.h>
#include <string.h>
#include <stdlib.h>
#include <linux/joystick.h>
#include <xf86.h>
#include <xf86_OSproc.h>