On Wed, Mar 22, 2017 at 03:11:35PM -0700, Eric Anholt wrote: > The X Server never generates a global config.h, and instead all these > paths are including dix-config.h or xorg-config.h. > --- > hw/xfree86/modes/xf86Crtc.c | 3 --- > hw/xfree86/modes/xf86Cursors.c | 3 --- > hw/xfree86/modes/xf86DiDGA.c | 3 --- > hw/xfree86/modes/xf86EdidModes.c | 3 --- > hw/xfree86/modes/xf86Modes.c | 3 --- > hw/xfree86/modes/xf86RandR12.c | 3 --- > hw/xfree86/modes/xf86Rotate.c | 3 --- > hw/xfree86/modes/xf86cvt.c | 3 --- > hw/xfree86/modes/xf86gtf.c | 3 --- > xkb/XKBMAlloc.c | 2 -- > xkb/XKBMisc.c | 2 -- > 11 files changed, 31 deletions(-) > > diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c > index 966a1689103f..fcf8343d1439 100644 > --- a/hw/xfree86/modes/xf86Crtc.c > +++ b/hw/xfree86/modes/xf86Crtc.c > @@ -24,9 +24,6 @@ > #ifdef HAVE_XORG_CONFIG_H > #include <xorg-config.h> > #else > -#ifdef HAVE_CONFIG_H > -#include <config.h> > -#endif > #endif
unifdef apparently isn't smart enough to realise that it leaves us with an empty else branch now. You're missing a few s-o-b as well in the commit messages, but with all that fixed, Reviewed-by: Peter Hutterer <[email protected]> Cheers, Peter > > #include <stddef.h> > diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c > index 9543eedb3996..095bf3e9138b 100644 > --- a/hw/xfree86/modes/xf86Cursors.c > +++ b/hw/xfree86/modes/xf86Cursors.c > @@ -24,9 +24,6 @@ > #ifdef HAVE_XORG_CONFIG_H > #include <xorg-config.h> > #else > -#ifdef HAVE_CONFIG_H > -#include <config.h> > -#endif > #endif > > #include <stddef.h> > diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c > index 645727441c19..ece94bbe04e7 100644 > --- a/hw/xfree86/modes/xf86DiDGA.c > +++ b/hw/xfree86/modes/xf86DiDGA.c > @@ -23,9 +23,6 @@ > #ifdef HAVE_XORG_CONFIG_H > #include <xorg-config.h> > #else > -#ifdef HAVE_CONFIG_H > -#include <config.h> > -#endif > #endif > > #include "xf86.h" > diff --git a/hw/xfree86/modes/xf86EdidModes.c > b/hw/xfree86/modes/xf86EdidModes.c > index b4ab14fc59ad..b29d95d16da1 100644 > --- a/hw/xfree86/modes/xf86EdidModes.c > +++ b/hw/xfree86/modes/xf86EdidModes.c > @@ -30,9 +30,6 @@ > #ifdef HAVE_XORG_CONFIG_H > #include <xorg-config.h> > #else > -#ifdef HAVE_CONFIG_H > -#include <config.h> > -#endif > #endif > > #define _PARSE_EDID_ > diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c > index 43b223307e8c..439fefd63b26 100644 > --- a/hw/xfree86/modes/xf86Modes.c > +++ b/hw/xfree86/modes/xf86Modes.c > @@ -28,9 +28,6 @@ > #ifdef HAVE_XORG_CONFIG_H > #include <xorg-config.h> > #else > -#ifdef HAVE_CONFIG_H > -#include <config.h> > -#endif > #endif > > #include "xf86Modes.h" > diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c > index d83461997409..0a670266378e 100644 > --- a/hw/xfree86/modes/xf86RandR12.c > +++ b/hw/xfree86/modes/xf86RandR12.c > @@ -23,9 +23,6 @@ > #ifdef HAVE_XORG_CONFIG_H > #include <xorg-config.h> > #else > -#ifdef HAVE_CONFIG_H > -#include <config.h> > -#endif > #endif > > #include "xf86.h" > diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c > index 13e5a50596b7..4a2d2f3b0b06 100644 > --- a/hw/xfree86/modes/xf86Rotate.c > +++ b/hw/xfree86/modes/xf86Rotate.c > @@ -24,9 +24,6 @@ > #ifdef HAVE_XORG_CONFIG_H > #include <xorg-config.h> > #else > -#ifdef HAVE_CONFIG_H > -#include <config.h> > -#endif > #endif > > #include <stddef.h> > diff --git a/hw/xfree86/modes/xf86cvt.c b/hw/xfree86/modes/xf86cvt.c > index b6c1bc81ce43..585ef804d636 100644 > --- a/hw/xfree86/modes/xf86cvt.c > +++ b/hw/xfree86/modes/xf86cvt.c > @@ -29,9 +29,6 @@ > #ifdef HAVE_XORG_CONFIG_H > #include <xorg-config.h> > #else > -#ifdef HAVE_CONFIG_H > -#include <config.h> > -#endif > #endif > > #include "xf86.h" > diff --git a/hw/xfree86/modes/xf86gtf.c b/hw/xfree86/modes/xf86gtf.c > index 17c2f3255527..bd329a00ce52 100644 > --- a/hw/xfree86/modes/xf86gtf.c > +++ b/hw/xfree86/modes/xf86gtf.c > @@ -63,9 +63,6 @@ > #ifdef HAVE_XORG_CONFIG_H > #include <xorg-config.h> > #else > -#ifdef HAVE_CONFIG_H > -#include <config.h> > -#endif > #endif > > #include "xf86.h" > diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c > index dbc1389e683c..3e380a8ea633 100644 > --- a/xkb/XKBMAlloc.c > +++ b/xkb/XKBMAlloc.c > @@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. > > #ifdef HAVE_DIX_CONFIG_H > #include <dix-config.h> > -#elif defined(HAVE_CONFIG_H) > -#include <config.h> > #endif > > #include <stdio.h> > diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c > index df268b5835a3..f17194528aa7 100644 > --- a/xkb/XKBMisc.c > +++ b/xkb/XKBMisc.c > @@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. > > #ifdef HAVE_DIX_CONFIG_H > #include <dix-config.h> > -#elif defined(HAVE_CONFIG_H) > -#include <config.h> > #endif > > #include <stdio.h> > -- > 2.11.0 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: https://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
