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:
parent
4cf2f4172a
commit
889a8dc02b
|
@ -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"
|
||||
|
|
|
@ -383,9 +383,6 @@ _X_HIDDEN void *dixLookupTab[] = {
|
|||
#ifdef PANORAMIX
|
||||
SYMVAR(noPanoramiXExtension)
|
||||
#endif
|
||||
|
||||
SYMVAR(noXInputExtension)
|
||||
|
||||
#ifdef XSELINUX
|
||||
SYMVAR(noSELinuxExtension)
|
||||
#endif
|
||||
|
|
|
@ -127,9 +127,6 @@ extern Bool noXkbExtension;
|
|||
extern Bool noPanoramiXExtension;
|
||||
#endif
|
||||
|
||||
extern Bool noXInputExtension;
|
||||
|
||||
|
||||
#ifdef XSELINUX
|
||||
extern Bool noSELinuxExtension;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user