Remove Xorg-specific extensions from non-Xorg miinitext

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@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Daniel Stone 2012-07-10 02:03:25 +01:00 committed by Keith Packard
parent 27a624bee6
commit 147967f67d

View File

@ -83,9 +83,6 @@ SOFTWARE.
#include <dmx-config.h> #include <dmx-config.h>
#undef XV #undef XV
#undef DBE #undef DBE
#undef XF86VIDMODE
#undef XFreeXDGA
#undef XF86DRI
#undef SCREENSAVER #undef SCREENSAVER
#undef RANDR #undef RANDR
#undef XFIXES #undef XFIXES
@ -102,17 +99,10 @@ SOFTWARE.
#ifdef HAVE_KDRIVE_CONFIG_H #ifdef HAVE_KDRIVE_CONFIG_H
#include <kdrive-config.h> #include <kdrive-config.h>
/* there must be a better way... */
#undef XFreeXDGA
#undef XF86DRI
#undef XF86VIDMODE
#endif #endif
#ifdef HAVE_XGL_CONFIG_H #ifdef HAVE_XGL_CONFIG_H
#include <xgl-config.h> #include <xgl-config.h>
#undef XFreeXDGA
#undef XF86DRI
#undef XF86VIDMODE
#endif #endif
#include "misc.h" #include "misc.h"
@ -323,20 +313,10 @@ InitExtensions(int argc, char *argv[])
ScreenSaverExtensionInit(); ScreenSaverExtensionInit();
#endif #endif
#if !defined(NO_HW_ONLY_EXTS) #if !defined(NO_HW_ONLY_EXTS) && defined(DPMSExtension)
#if defined(XF86VIDMODE)
if (!noXFree86VidModeExtension)
XFree86VidModeExtensionInit();
#endif
#if defined(XFreeXDGA)
if (!noXFree86DGAExtension)
XFree86DGAExtensionInit();
#endif
#ifdef DPMSExtension
if (!noDPMSExtension) if (!noDPMSExtension)
DPMSExtensionInit(); DPMSExtensionInit();
#endif #endif
#endif
#ifdef XV #ifdef XV
if (!noXvExtension) { if (!noXvExtension) {
@ -360,11 +340,6 @@ InitExtensions(int argc, char *argv[])
DbeExtensionInit(); DbeExtensionInit();
#endif #endif
#if !defined(NO_HW_ONLY_EXTS) && defined(XF86DRI)
if (!noXFree86DRIExtension)
XFree86DRIExtensionInit();
#endif
#ifdef DMXEXT #ifdef DMXEXT
DMXExtensionInit(); /* server-specific extension, cannot be disabled */ DMXExtensionInit(); /* server-specific extension, cannot be disabled */
#endif #endif