andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xf86: Fix build against recent Linux kernel

Browse Source 
Recent Linux kernels reworked the linux/input.h header file, which is
now part of the "user-space API". The include guard therefore has an
additional additional _UAPI prefix.

Instead of adding another case to the #ifdef, drop any include guard
checks and instead always undefine the BUS_* definitions on Linux.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Thierry Reding 2012-10-17 12:11:49 +02:00 committed by Peter Hutterer
parent 7d89eb4978
commit c5396ec05a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86str.h
View File

@ -347,7 +347,7 @@ typedef struct _DriverRec {
*/ */
/* Tolerate prior #include <linux/input.h> */ /* Tolerate prior #include <linux/input.h> */
#if defined(linux) && defined(_INPUT_H) #if defined(linux)
#undef BUS_NONE #undef BUS_NONE
#undef BUS_PCI #undef BUS_PCI
#undef BUS_SBUS #undef BUS_SBUS