xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Mon Aug 5 21:45:51 PDT 2013
mi/miinitext.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5a36cdd91530d27627e39159a89b53f9fbb75280
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Aug 5 20:46:45 2013 -0700
Allow disabling XFree86-DGA, DRI, VidModeExtension extensions
Code to recognize these in extension enable/disable options was wrapped
in #ifdef XorgLoader, but that's not defined when building miinitext.c
since the great module merge of 1.13. Change to an #ifdef that is defined.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Robert Hooker <robert.hooker at canonical.com>
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 81c663a..dbca9f7 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -157,7 +157,7 @@ static ExtensionToggle ExtensionToggleList[] = {
#ifdef XF86BIGFONT
{"XFree86-Bigfont", &noXFree86BigfontExtension},
#endif
-#ifdef XorgLoader
+#ifdef XORGSERVER
#ifdef XFreeXDGA
{"XFree86-DGA", &noXFree86DGAExtension},
#endif
More information about the xorg-commit
mailing list