XC-MISC is built-in and mandatory.
This commit is contained in:
parent
9757106bba
commit
3fcf4d3eb8
|
@ -24,13 +24,13 @@ BUILTIN_SRCS = \
|
|||
shape.c \
|
||||
sleepuntil.c \
|
||||
sleepuntil.h \
|
||||
xcmisc.c \
|
||||
xtest.c \
|
||||
geext.c
|
||||
|
||||
# Sources always included in libXextmodule.la & libXext.la
|
||||
MODULE_SRCS = \
|
||||
sync.c \
|
||||
xcmisc.c
|
||||
sync.c
|
||||
|
||||
# Optional sources included if extension enabled by configure.ac rules
|
||||
|
||||
|
|
|
@ -83,15 +83,6 @@ static ExtensionModule extensionModules[] = {
|
|||
NULL
|
||||
},
|
||||
#endif
|
||||
#ifdef XCMISC
|
||||
{
|
||||
XCMiscExtensionInit,
|
||||
XCMiscExtensionName,
|
||||
&noXCMiscExtension,
|
||||
NULL,
|
||||
NULL
|
||||
},
|
||||
#endif
|
||||
#ifdef XF86VIDMODE
|
||||
{
|
||||
XFree86VidModeExtensionInit,
|
||||
|
|
|
@ -39,11 +39,6 @@ extern void ScreenSaverExtensionInit (INITARGS);
|
|||
#include <X11/extensions/saver.h>
|
||||
#endif
|
||||
|
||||
#ifdef XCMISC
|
||||
extern void XCMiscExtensionInit(INITARGS);
|
||||
#include <X11/extensions/xcmiscstr.h>
|
||||
#endif
|
||||
|
||||
#ifdef XF86VIDMODE
|
||||
extern void XFree86VidModeExtensionInit(INITARGS);
|
||||
#define _XF86VIDMODE_SERVER_
|
||||
|
|
|
@ -378,9 +378,6 @@ _X_HIDDEN void *dixLookupTab[] = {
|
|||
#ifdef RES
|
||||
SYMVAR(noResExtension)
|
||||
#endif
|
||||
#ifdef XCMISC
|
||||
SYMVAR(noXCMiscExtension)
|
||||
#endif
|
||||
#ifdef XEVIE
|
||||
SYMVAR(noXevieExtension)
|
||||
#endif
|
||||
|
|
|
@ -97,10 +97,6 @@ extern Bool noSyncExtension;
|
|||
extern Bool noResExtension;
|
||||
#endif
|
||||
|
||||
#ifdef XCMISC
|
||||
extern Bool noXCMiscExtension;
|
||||
#endif
|
||||
|
||||
#ifdef XEVIE
|
||||
extern Bool noXevieExtension;
|
||||
#endif
|
||||
|
|
|
@ -122,9 +122,6 @@ extern Bool noSyncExtension;
|
|||
#ifdef RES
|
||||
extern Bool noResExtension;
|
||||
#endif
|
||||
#ifdef XCMISC
|
||||
extern Bool noXCMiscExtension;
|
||||
#endif
|
||||
#ifdef XEVIE
|
||||
extern Bool noXevieExtension;
|
||||
#endif
|
||||
|
@ -234,9 +231,7 @@ extern void SyncExtensionInit(INITARGS);
|
|||
#ifdef XKB
|
||||
extern void XkbExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef XCMISC
|
||||
extern void XCMiscExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef XRECORD
|
||||
extern void RecordExtensionInit(INITARGS);
|
||||
#endif
|
||||
|
@ -347,9 +342,6 @@ static ExtensionToggle ExtensionToggleList[] =
|
|||
#ifdef RES
|
||||
{ "X-Resource", &noResExtension },
|
||||
#endif
|
||||
#ifdef XCMISC
|
||||
{ "XC-MISC", &noXCMiscExtension },
|
||||
#endif
|
||||
#ifdef XEVIE
|
||||
{ "XEVIE", &noXevieExtension },
|
||||
#endif
|
||||
|
@ -456,9 +448,7 @@ InitExtensions(int argc, char *argv[])
|
|||
#if defined(XKB)
|
||||
if (!noXkbExtension) XkbExtensionInit();
|
||||
#endif
|
||||
#ifdef XCMISC
|
||||
if (!noXCMiscExtension) XCMiscExtensionInit();
|
||||
#endif
|
||||
XCMiscExtensionInit();
|
||||
#ifdef XRECORD
|
||||
if (!noTestExtensions) RecordExtensionInit();
|
||||
#endif
|
||||
|
@ -545,6 +535,7 @@ static ExtensionModule staticExtensions[] = {
|
|||
#ifdef XKB
|
||||
{ XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL },
|
||||
#endif
|
||||
{ XCMiscExtensionInit, "XC-MISC", NULL, NULL, NULL },
|
||||
#ifdef XCSECURITY
|
||||
{ SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
|
||||
#endif
|
||||
|
|
|
@ -165,9 +165,6 @@ _X_EXPORT Bool noSyncExtension = FALSE;
|
|||
#ifdef RES
|
||||
_X_EXPORT Bool noResExtension = FALSE;
|
||||
#endif
|
||||
#ifdef XCMISC
|
||||
_X_EXPORT Bool noXCMiscExtension = FALSE;
|
||||
#endif
|
||||
#ifdef XEVIE
|
||||
/* Xevie is disabled by default for now until the
|
||||
* interface is stable */
|
||||
|
|
Loading…
Reference in New Issue
Block a user