From c9ec2bab2f258798fd6e6676698c732f09571a60 Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@redhat.com>
Date: Sat, 26 Sep 2009 13:10:54 +1000
Subject: dmx: undefine MITSHM, move undefs to miinitext.c.

This patch undefines MITSHM for dmx - we don't support the required
screen->ModifyPixmapHeaders. All undefines are moved from dmx-config to
miinitext.c, where they belong.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 hw/dmx/dmx-config.h | 13 -------------
 mi/miinitext.c      | 12 ++++++++++++
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h
index 5b7b60593..9791dc0bc 100644
--- a/hw/dmx/dmx-config.h
+++ b/hw/dmx/dmx-config.h
@@ -72,17 +72,4 @@
 /* Enable the DMX extension */
 #define DMXEXT
 
-/* Disable the extensions that are not currently supported */
-#undef MULTIBUFFER
-#undef XV
-#undef DBE
-#undef XF86VIDMODE
-#undef XFreeXDGA
-#undef XF86DRI
-#undef SCREENSAVER
-#undef RANDR
-#undef XFIXES
-#undef DAMAGE
-#undef COMPOSITE
-
 #endif /* DMX_CONFIG_H */
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 7f59126a4..0dca390bb 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -55,6 +55,18 @@ SOFTWARE.
 
 #ifdef HAVE_DMX_CONFIG_H
 #include <dmx-config.h>
+#undef MULTIBUFFER
+#undef XV
+#undef DBE
+#undef XF86VIDMODE
+#undef XFreeXDGA
+#undef XF86DRI
+#undef SCREENSAVER
+#undef RANDR
+#undef XFIXES
+#undef DAMAGE
+#undef COMPOSITE
+#undef MITSHM
 #endif
 
 #ifdef HAVE_XNEST_CONFIG_H
-- 
cgit v1.2.3