This applies regardless of which DRI you're asking for. Worse, leaving it out means breaking the config file syntax in a pointless way, since non-DRI servers can safely just parse it and ignore it.
Signed-off-by: Adam Jackson <[email protected]> --- hw/xfree86/common/xf86Config.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index d2c3225..0c067c0 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -46,10 +46,8 @@ #include <xorg-config.h> #endif -#ifdef XF86DRI #include <sys/types.h> #include <grp.h> -#endif #include "xf86.h" #include "xf86Modes.h" @@ -132,9 +130,7 @@ static Bool configInput(InputInfoPtr pInfo, XF86ConfInputPtr conf_input, static Bool configDisplay(DispPtr displayp, XF86ConfDisplayPtr conf_display); static Bool addDefaultModes(MonPtr monitorp); -#ifdef XF86DRI static void configDRI(XF86ConfDRIPtr drip); -#endif static void configExtensions(XF86ConfExtensionsPtr conf_ext); /* @@ -2218,7 +2214,6 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active, Bool g return TRUE; } -#ifdef XF86DRI static void configDRI(XF86ConfDRIPtr drip) { @@ -2239,7 +2234,6 @@ configDRI(XF86ConfDRIPtr drip) xf86ConfigDRI.mode = drip->dri_mode; } } -#endif static void configExtensions(XF86ConfExtensionsPtr conf_ext) @@ -2532,9 +2526,7 @@ xf86HandleConfigFile(Bool autoconfig) configServerFlags(xf86configptr->conf_flags, xf86ConfigLayout.options); configFiles(xf86configptr->conf_files); configExtensions(xf86configptr->conf_extensions); -#ifdef XF86DRI configDRI(xf86configptr->conf_dri); -#endif checkInput(&xf86ConfigLayout, implicit_layout); -- 2.5.0 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
