diff options
| author | Kevin E Martin <kem@redhat.com> | 2009-09-26 13:10:54 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-27 20:18:07 +1000 |
| commit | bb7c26e38c262614c5d1c21fc7a04c71a9028e51 (patch) | |
| tree | a782cc45db70fcb2275752a086da70a880b09166 | |
| parent | 72f0194be1558f244bad85197ccc50e17561df50 (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>
(cherry picked from commit c9ec2bab2f258798fd6e6676698c732f09571a60)
| -rw-r--r-- | hw/dmx/dmx-config.h | 13 | ||||
| -rw-r--r-- | 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 |