[PATCH 41/54] 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>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 mi/miinitext.c |   27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/mi/miinitext.c b/mi/miinitext.c
index c1900b6..b42ede6 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -83,9 +83,6 @@ SOFTWARE.
 #include <dmx-config.h>
 #undef XV
 #undef DBE
-#undef XF86VIDMODE
-#undef XFreeXDGA
-#undef XF86DRI
 #undef SCREENSAVER
 #undef RANDR
 #undef XFIXES
@@ -102,17 +99,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"
@@ -323,20 +313,10 @@ InitExtensions(int argc, char *argv[])
         ScreenSaverExtensionInit();
 #endif
 
-#if !defined(NO_HW_ONLY_EXTS)
-#if defined(XF86VIDMODE)
-    if (!noXFree86VidModeExtension)
-        XFree86VidModeExtensionInit();
-#endif
-#if defined(XFreeXDGA)
-    if (!noXFree86DGAExtension)
-        XFree86DGAExtensionInit();
-#endif
-#ifdef DPMSExtension
+#if !defined(NO_HW_ONLY_EXTS) && defined(DPMSExtension)
     if (!noDPMSExtension)
         DPMSExtensionInit();
 #endif
-#endif
 
 #ifdef XV
     if (!noXvExtension) {
@@ -360,11 +340,6 @@ InitExtensions(int argc, char *argv[])
         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.10.4