Hi, On 27 July 2013 00:53, Alan Coopersmith <[email protected]> wrote: > Code to recognize these in extension enable/disable options was wrapped > in #ifdef XFree86Loader, 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 <[email protected]>
Yeah, dealing with enable/disable of extensions not in miinitext.c is the very last part of that series that I never quite managed to make work. So I left it alone, and then suddenly it was a year later so I just decided to merge it before another year passed. ;) Reviewed-by: Daniel Stone <[email protected]> > mi/miinitext.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Found while helping a user on #xorg IRC. > > Tested by running Xorg -config xorg.conf.no-dga, with this in > xorg.conf.no-dga: > Section "Extensions" > Option "XFree86-DGA" "Disable" > EndSection > > Before this fix: > [1469450.113] (WW) Ignoring unrecognized extension "XFree86-DGA" > > After this fix: > [1469526.870] (**) Extension "XFree86-DGA" is disabled > > > 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 > -- > 1.7.9.2 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
