diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-10-22 22:29:54 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-11-04 16:01:07 +1030 |
| commit | 889a8dc02bbd3926eaf16dce8f844dc58558e982 (patch) | |
| tree | 5272408c75fbba1f1d6b721dd4c9f3ddbbd641bb | |
| parent | 4cf2f4172abc4bf848c1726e6dac535713e08f0b (diff) | |
Xi: XINPUT has been mandatory for ages
Ditch all #ifdef XINPUT, since it's always built.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
| -rw-r--r-- | hw/xfree86/common/xf86Events.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/loader/dixsym.c | 3 | ||||
| -rw-r--r-- | include/globals.h | 3 | ||||
| -rw-r--r-- | mi/miinitext.c | 7 | ||||
| -rw-r--r-- | os/utils.c | 1 |
5 files changed, 3 insertions, 14 deletions
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index babe45b3e..d6ef93a1b 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -68,12 +68,9 @@ #include "dgaproc.h" #endif -#ifdef XINPUT #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> -#else #include "inputstr.h" -#endif #include "xf86Xinput.h" #include "mi.h" diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 683c166fc..190626eaa 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -383,9 +383,6 @@ _X_HIDDEN void *dixLookupTab[] = { #ifdef PANORAMIX SYMVAR(noPanoramiXExtension) #endif - - SYMVAR(noXInputExtension) - #ifdef XSELINUX SYMVAR(noSELinuxExtension) #endif diff --git a/include/globals.h b/include/globals.h index 63e998a71..68ea2cbe2 100644 --- a/include/globals.h +++ b/include/globals.h @@ -127,9 +127,6 @@ extern Bool noXkbExtension; extern Bool noPanoramiXExtension; #endif -extern Bool noXInputExtension; - - #ifdef XSELINUX extern Bool noSELinuxExtension; diff --git a/mi/miinitext.c b/mi/miinitext.c index 3a943b386..bfcb10d40 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -147,7 +147,6 @@ extern Bool noPanoramiXExtension; #ifdef INXQUARTZ extern Bool noPseudoramiXExtension; #endif -extern Bool noXInputExtension; #ifdef XSELINUX extern Bool noSELinuxExtension; #endif @@ -349,7 +348,7 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef PANORAMIX { "XINERAMA", &noPanoramiXExtension }, #endif - { "XInputExtension", &noXInputExtension }, + { "XInputExtension", NULL }, #ifdef XKB { "XKEYBOARD", &noXkbExtension }, #endif @@ -411,7 +410,7 @@ InitExtensions(int argc, char *argv[]) #ifdef MULTIBUFFER if (!noMultibufferExtension) MultibufferExtensionInit(); #endif - if (!noXInputExtension) XInputExtensionInit(); + XInputExtensionInit(); #ifdef XTEST if (!noTestExtensions) XTestExtensionInit(); #endif @@ -499,7 +498,7 @@ static ExtensionModule staticExtensions[] = { #ifdef MITSHM { ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL }, #endif - { XInputExtensionInit, "XInputExtension", &noXInputExtension, NULL, NULL }, + { XInputExtensionInit, "XInputExtension", NULL, NULL, NULL }, #ifdef XTEST { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL }, #endif diff --git a/os/utils.c b/os/utils.c index b5dcd65cd..b936d4c69 100644 --- a/os/utils.c +++ b/os/utils.c @@ -185,7 +185,6 @@ _X_EXPORT Bool noXFixesExtension = FALSE; /* Xinerama is disabled by default unless enabled via +xinerama */ _X_EXPORT Bool noPanoramiXExtension = TRUE; #endif -_X_EXPORT Bool noXInputExtension = FALSE; #ifdef XSELINUX _X_EXPORT Bool noSELinuxExtension = FALSE; _X_EXPORT int selinuxEnforcingState = SELINUX_MODE_DEFAULT; |