summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@redhat.com>2009-09-26 03:10:54 (GMT)
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-26 03:14:50 (GMT)
commitc9ec2bab2f258798fd6e6676698c732f09571a60 (patch)
treeaa7fc836c22718cab1d02767d9204b934e314bb7
parentfc9d733bab3ff0e4e51b19c73b66196dca563a70 (diff)
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>
-rw-r--r--hw/dmx/dmx-config.h13
-rw-r--r--mi/miinitext.c12
2 files changed, 12 insertions, 13 deletions
diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h
index 5b7b605..9791dc0 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 7f59126..0dca390 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