From 3d97e8a41a8a15769f43233a2ed7692387cb0b81 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Sun, 29 Aug 2004 21:06:00 +0000 Subject: =?UTF-8?q?Fix=20make=20install=20when=20BuildServersOnly=20is=20Y?= =?UTF-8?q?ES=20(Bug=20#1213).=20Fix=20build=20failures=20when=20UseDeprec?= =?UTF-8?q?atedKeyboardDriver=20is=20YES=20and=20=20=20=20=20DoLoadableSer?= =?UTF-8?q?ver=20is=20NO=20(Bug=20#1229,=20Kristian=20H=F8gsberg).=20Fix?= =?UTF-8?q?=20failure=20when=20using=20DLL=20loader=20and=20LD=5FBIND=5FNO?= =?UTF-8?q?W=20is=20set=20(Bug=20#1212,=20Adam=20=20=20=20=20Jackson).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/kbd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/kbd.c b/src/kbd.c index 2ebb861..20b786e 100644 --- a/src/kbd.c +++ b/src/kbd.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.3 2004/08/16 20:17:52 kem Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.4 2004/08/16 22:48:51 kem Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.8 2003/11/03 05:11:47 tsi Exp $ */ /* @@ -12,7 +12,7 @@ * xf86Events.c and xf86Io.c which are * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.3 2004/08/16 20:17:52 kem Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.4 2004/08/16 22:48:51 kem Exp $ */ #define NEED_EVENTS #include "X.h" @@ -69,7 +69,6 @@ InputDriverRec KBD = { 0 }; -#ifndef USE_DEPRECATED_KEYBOARD_DRIVER InputDriverRec KEYBOARD = { 1, "keyboard", @@ -79,7 +78,6 @@ InputDriverRec KEYBOARD = { NULL, 0 }; -#endif typedef enum { OPTION_ALWAYS_CORE, -- cgit v1.2.1