From: Trevor Woerner <[email protected]> Following the same pattern as a similar cleanup in driver/xf86-video-vmware.
Signed-off-by: Trevor Woerner <[email protected]> --- configure.ac | 3 +++ src/kbd.c | 5 +++++ src/lnx_KbdMap.c | 5 +++++ src/lnx_kbd.c | 5 +++++ 4 files changed, 18 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 8aea810..7cf54d0 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +46,9 @@ XORG_DEFAULT_OPTIONS # Obtain compiler/linker options from server and required extensions PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2.99.0] xproto inputproto) +PKG_CHECK_EXISTS([xorg-server >= 1.4.99], + [AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1, + [Has version 1.5.0 or greater of the Xserver])]) # Define a configure option for an alternate input module directory AC_ARG_WITH(xorg-module-dir, diff --git a/src/kbd.c b/src/kbd.c index e0b7003..3aeffeb 100644 --- a/src/kbd.c +++ b/src/kbd.c @@ -41,6 +41,11 @@ #include "xkbstr.h" #include "xkbsrv.h" +#ifndef HAVE_XORG_SERVER_1_5_0 +#include <xf86_ansic.h> +#include <xf86_libc.h> +#endif + #define CAPSFLAG 1 #define NUMFLAG 2 #define SCROLLFLAG 4 diff --git a/src/lnx_KbdMap.c b/src/lnx_KbdMap.c index 21bed2e..66410a4 100644 --- a/src/lnx_KbdMap.c +++ b/src/lnx_KbdMap.c @@ -26,6 +26,11 @@ #include "lnx_kbd.h" +#ifndef HAVE_XORG_SERVER_1_5_0 +#include <xf86_ansic.h> +#include <xf86_libc.h> +#endif + /*ARGSUSED*/ /* diff --git a/src/lnx_kbd.c b/src/lnx_kbd.c index 9b3aae3..d0605ff 100644 --- a/src/lnx_kbd.c +++ b/src/lnx_kbd.c @@ -30,6 +30,11 @@ #include "atKeynames.h" #include "lnx_kbd.h" +#ifndef HAVE_XORG_SERVER_1_5_0 +#include <xf86_ansic.h> +#include <xf86_libc.h> +#endif + #define KBC_TIMEOUT 250 /* Timeout in ms for sending to keyboard controller */ static KbdProtocolRec protocols[] = { -- 1.7.3.1.104.gc752e _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
