XC-MISC is built-in and mandatory.

7 files changed, 4 insertions, 37 deletions

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 58e6c6db3..a9412165d 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -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
 
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index 57dd0fdb0..85ef198a4 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -83,15 +83,6 @@ static ExtensionModule extensionModules[] = {
 	NULL
     },
 #endif
-#ifdef XCMISC
-    {
-	XCMiscExtensionInit,
-	XCMiscExtensionName,
-	&noXCMiscExtension,
-	NULL,
-	NULL
-    },
-#endif
 #ifdef XF86VIDMODE
     {
 	XFree86VidModeExtensionInit,
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index fc31c0dfd..b48e42d77 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -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_
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 4441ecc13..9ac8af7b8 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -378,9 +378,6 @@ _X_HIDDEN void *dixLookupTab[] = {
 #ifdef RES
     SYMVAR(noResExtension)
 #endif
-#ifdef XCMISC
-    SYMVAR(noXCMiscExtension)
-#endif
 #ifdef XEVIE
     SYMVAR(noXevieExtension)
 #endif
diff --git a/include/globals.h b/include/globals.h
index ff11c707c..2f158ea16 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -97,10 +97,6 @@ extern Bool noSyncExtension;
 extern Bool noResExtension;
 #endif
 
-#ifdef XCMISC
-extern Bool noXCMiscExtension;
-#endif
-
 #ifdef XEVIE
 extern Bool noXevieExtension;
 #endif
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
diff --git a/os/utils.c b/os/utils.c
index 70bbdaa05..a28db551e 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -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 */