diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-07-24 15:09:05 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-07-24 15:46:08 -0400 |
| commit | 3fcf4d3eb89fecaa2be7b5ac4933b693c9c3d97e (patch) | |
| tree | 9a105cb689d84ff00c8f2da96e76996a25d71bdb /mi/miinitext.c | |
| parent | 9757106bba8f7bea99c5211817fc6b5fde4e6f66 (diff) | |
XC-MISC is built-in and mandatory.
Diffstat (limited to 'mi/miinitext.c')
| -rw-r--r-- | mi/miinitext.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index 01b115960..ea54163bb 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -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 |