summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-07-10 02:03:25 +0100
committerKeith Packard <keithp@keithp.com>2012-07-10 00:31:02 -0700
commit147967f67d4976a87ed07fe11b59b174907f5d43 (patch)
tree36d50778b83c005b7f1209edb3b2fbd78da8cf8b
parent27a624bee66d2797eacf90317054207dcf248028 (diff)
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>
-rw-r--r--mi/miinitext.c27
1 files changed, 1 insertions, 26 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 69ed97bb9..d76d79676 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