On Fri, Apr 09, 2010 at 02:33:03PM -0400, Gaetan Nadon wrote: > The generated config.h does not need to include xorg-server.h > for the content it provides. > Add #include <xorg-server.h> in .[hc] files as needed. > > Signed-off-by: Gaetan Nadon <[email protected]> > --- > configure.ac | 2 -- > src/acecad.c | 3 +++ > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/configure.ac b/configure.ac > index d71f9d7..fd7d1cc 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -45,8 +45,6 @@ AC_DISABLE_STATIC > AC_PROG_LIBTOOL > AC_PROG_CC > > -AH_TOP([#include "xorg-server.h"]) > - > AC_ARG_WITH(xorg-module-dir, > AC_HELP_STRING([--with-xorg-module-dir=DIR], > [Default xorg module directory > [[default=$libdir/xorg/modules]]]), > diff --git a/src/acecad.c b/src/acecad.c > index 61e4c21..2c8c78b 100644 > --- a/src/acecad.c > +++ b/src/acecad.c > @@ -24,8 +24,11 @@ > * > */ > > +#ifdef HAVE_CONFIG_H > #include "config.h" > +#endif
Please split this out, this is a separate bug. > +#include <xorg-server.h> > #include <xorgVersion.h> > #define XORG_VERSION_BOTCHED XORG_VERSION_NUMERIC(1,4,0,0,0) > #if XORG_VERSION_CURRENT >= XORG_VERSION_BOTCHED > -- > 1.6.0.4 > > All drivers have this AH_TOP config line and I suspect only a few really need > it. > Is there any reason (workaround or whatever) for xorg-server.h to be obtained > through this round about way? I guess it's just a leftover from the modularization efforts that can be fixed now. Cheers, Peter _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
