frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Daniel Stone 2008-10-22 22:29:54 +10:30 committed by Peter Hutterer
parent 4cf2f4172a
commit 889a8dc02b
5 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/common/xf86Events.c
View File

@ -68,12 +68,9 @@
#include "dgaproc.h" #include "dgaproc.h"
#endif #endif
#ifdef XINPUT
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#else
#include "inputstr.h" #include "inputstr.h"
#endif
#include "xf86Xinput.h" #include "xf86Xinput.h"
#include "mi.h" #include "mi.h"

3
hw/xfree86/loader/dixsym.c
View File

@ -383,9 +383,6 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef PANORAMIX #ifdef PANORAMIX
SYMVAR(noPanoramiXExtension) SYMVAR(noPanoramiXExtension)
#endif #endif
SYMVAR(noXInputExtension)
#ifdef XSELINUX #ifdef XSELINUX
SYMVAR(noSELinuxExtension) SYMVAR(noSELinuxExtension)
#endif #endif

3
include/globals.h
View File

@ -127,9 +127,6 @@ extern Bool noXkbExtension;
extern Bool noPanoramiXExtension; extern Bool noPanoramiXExtension;
#endif #endif
extern Bool noXInputExtension;
#ifdef XSELINUX #ifdef XSELINUX
extern Bool noSELinuxExtension; extern Bool noSELinuxExtension;

7
mi/miinitext.c
View File

@ -147,7 +147,6 @@ extern Bool noPanoramiXExtension;
#ifdef INXQUARTZ #ifdef INXQUARTZ
extern Bool noPseudoramiXExtension; extern Bool noPseudoramiXExtension;
#endif #endif
extern Bool noXInputExtension;
#ifdef XSELINUX #ifdef XSELINUX
extern Bool noSELinuxExtension; extern Bool noSELinuxExtension;
#endif #endif
@ -349,7 +348,7 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef PANORAMIX #ifdef PANORAMIX
{ "XINERAMA", &noPanoramiXExtension }, { "XINERAMA", &noPanoramiXExtension },
#endif #endif
{ "XInputExtension", &noXInputExtension }, { "XInputExtension", NULL },
#ifdef XKB #ifdef XKB
{ "XKEYBOARD", &noXkbExtension }, { "XKEYBOARD", &noXkbExtension },
#endif #endif
@ -411,7 +410,7 @@ InitExtensions(int argc, char *argv[])
#ifdef MULTIBUFFER #ifdef MULTIBUFFER
if (!noMultibufferExtension) MultibufferExtensionInit(); if (!noMultibufferExtension) MultibufferExtensionInit();
#endif #endif
if (!noXInputExtension) XInputExtensionInit(); XInputExtensionInit();
#ifdef XTEST #ifdef XTEST
if (!noTestExtensions) XTestExtensionInit(); if (!noTestExtensions) XTestExtensionInit();
#endif #endif
@ -499,7 +498,7 @@ static ExtensionModule staticExtensions[] = {
#ifdef MITSHM #ifdef MITSHM
{ ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL }, { ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL },
#endif #endif
{ XInputExtensionInit, "XInputExtension", &noXInputExtension, NULL, NULL }, { XInputExtensionInit, "XInputExtension", NULL, NULL, NULL },
#ifdef XTEST #ifdef XTEST
{ XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL }, { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
#endif #endif

1
os/utils.c
View File

@ -185,7 +185,6 @@ _X_EXPORT Bool noXFixesExtension = FALSE;
/* Xinerama is disabled by default unless enabled via +xinerama */ /* Xinerama is disabled by default unless enabled via +xinerama */
_X_EXPORT Bool noPanoramiXExtension = TRUE; _X_EXPORT Bool noPanoramiXExtension = TRUE;
#endif #endif
_X_EXPORT Bool noXInputExtension = FALSE;
#ifdef XSELINUX #ifdef XSELINUX
_X_EXPORT Bool noSELinuxExtension = FALSE; _X_EXPORT Bool noSELinuxExtension = FALSE;
_X_EXPORT int selinuxEnforcingState = SELINUX_MODE_DEFAULT; _X_EXPORT int selinuxEnforcingState = SELINUX_MODE_DEFAULT;