diff options
| author | Kevin E Martin <kem@kem.org> | 2004-08-29 21:06:00 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2004-08-29 21:06:00 +0000 |
| commit | 3d97e8a41a8a15769f43233a2ed7692387cb0b81 (patch) | |
| tree | f165bf5c1b9e8f0ea841d8d92db0ae15884fa31d | |
| parent | 9e2172ffef436acb9a88147f276c9ddf12739a14 (diff) | |
| download | xorg-driver-xf86-input-keyboard-3d97e8a41a8a15769f43233a2ed7692387cb0b81.tar.gz | |
Fix make install when BuildServersOnly is YES (Bug #1213).
Fix build failures when UseDeprecatedKeyboardDriver is YES and
DoLoadableServer is NO (Bug #1229, Kristian Høgsberg).
Fix failure when using DLL loader and LD_BIND_NOW is set (Bug #1212, Adam
Jackson).
| -rw-r--r-- | src/kbd.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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, |