[PATCH 29/37] Remove Xorg-specific extensions from non-Xorg miinitext

[Daniel Stone]

miinitext.c had a completely separate codepath for non-Xorg servers,
which included tests for Xorg-specific extensions such as
XFree86-VidMode, which were external even to the Xorg DDX.  So we can
just remove them, and the associated #undefs.

Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
 mi/miinitext.c |   32 +-------------------------------
 1 files changed, 1 insertions(+), 31 deletions(-)

diff --git a/mi/miinitext.c b/mi/miinitext.c
index 544dce2..9d359e7 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -84,9 +84,6 @@ SOFTWARE.
 #include <dmx-config.h>
 #undef XV
 #undef DBE
-#undef XF86VIDMODE
-#undef XFreeXDGA
-#undef XF86DRI
 #undef SCREENSAVER
 #undef RANDR
 #undef XFIXES
@@ -103,17 +100,10 @@ SOFTWARE.
 
 #ifdef HAVE_KDRIVE_CONFIG_H
 #include <kdrive-config.h>
-/* there must be a better way... */
-#undef XFreeXDGA
-#undef XF86DRI
-#undef XF86VIDMODE
 #endif
 
 #ifdef HAVE_XGL_CONFIG_H
 #include <xgl-config.h>
-#undef XFreeXDGA
-#undef XF86DRI
-#undef XF86VIDMODE
 #endif
 
 #include "misc.h"
@@ -155,15 +145,6 @@ extern Bool noResExtension;
 #ifdef XF86BIGFONT
 extern Bool noXFree86BigfontExtension;
 #endif
-#ifdef XFreeXDGA
-extern Bool noXFree86DGAExtension;
-#endif
-#ifdef XF86DRI
-extern Bool noXFree86DRIExtension;
-#endif
-#ifdef XF86VIDMODE
-extern Bool noXFree86VidModeExtension;
-#endif
 #ifdef XFIXES
 extern Bool noXFixesExtension;
 #endif
@@ -469,17 +450,9 @@ InitExtensions(int argc, char *argv[])
     if (!noScreenSaverExtension) ScreenSaverExtensionInit ();
 #endif
 
-#if !defined(NO_HW_ONLY_EXTS)
-#if defined(XF86VIDMODE)
-    if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();
-#endif
-#if defined(XFreeXDGA)
-    if (!noXFree86DGAExtension) XFree86DGAExtensionInit();
-#endif
-#if defined(DPMSExtension)
+#if !defined(NO_HW_ONLY_EXTS) && defined(DPMSExtension)
     if (!noDPMSExtension) DPMSExtensionInit();
 #endif
-#endif
 
 #ifdef XV
     if (!noXvExtension) {
@@ -496,9 +469,6 @@ InitExtensions(int argc, char *argv[])
 #ifdef DBE
     if (!noDbeExtension) DbeExtensionInit();
 #endif
-#if !defined(NO_HW_ONLY_EXTS) && defined(XF86DRI)
-    if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
-#endif
 #ifdef DMXEXT
     DMXExtensionInit(); /* server-specific extension, cannot be disabled */
 #endif
-- 
1.7.5.4