Ping... On Mon, Dec 03, 2012 at 07:54:56AM +0100, Matthieu Herrb wrote: > Use consistent preprocessor sympbol to check if XAA support > should be built, and make sure it's defined when needed. > > Signed-off-by: Matthieu Herrb <[email protected]> > --- > configure.ac | 3 +++ > src/mga_dri.c | 2 +- > src/mga_driver.c | 6 +++--- > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/configure.ac b/configure.ac > index fca1a9c..5fa9f89 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -138,6 +138,9 @@ if test "x$XAA" != xno; then > CFLAGS=$XORG_CFLAGS > CPPFLAGS="$XORG_CFLAGS" > AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) > + if test "x$XAA" = xyes; then > + AC_DEFINE(USE_XAA, 1, [Build support for xaa]) > + fi > CFLAGS=$save_CFLAGS > CPPFLAGS=$save_CPPFLAGS > fi > diff --git a/src/mga_dri.c b/src/mga_dri.c > index 3923c04..a1c39f3 100644 > --- a/src/mga_dri.c > +++ b/src/mga_dri.c > @@ -355,7 +355,7 @@ void MGAGetQuiescence( ScrnInfoPtr pScrn ) > MGAWaitForIdleDMA( pScrn ); > > /* FIXME what about EXA? */ > -#ifdef XAA > +#ifdef USE_XAA > if (!pMga->Exa && pMga->AccelInfoRec) { > WAITFIFO( 11 ); > OUTREG( MGAREG_MACCESS, pMga->MAccess ); > diff --git a/src/mga_driver.c b/src/mga_driver.c > index 8c4bb9c..ace9b16 100644 > --- a/src/mga_driver.c > +++ b/src/mga_driver.c > @@ -87,7 +87,7 @@ > #include "mga_macros.h" > #include "mga_maven.h" > > -#ifdef XAA > +#ifdef HAVE_XAA_H > #include "xaa.h" > #endif > > @@ -2115,7 +2115,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) > } > } else { > #endif > -#ifdef XAA > +#ifdef USE_XAA > if (!xf86LoadSubModule(pScrn, "xaa")) { > xf86DrvMsg(pScrn->scrnIndex, X_INFO, > "Falling back to shadowfb\n"); > @@ -3765,7 +3765,7 @@ MGACloseScreen(CLOSE_SCREEN_ARGS_DECL) > pMgaEnt->refCount--; > } > > -#ifdef XAA > +#ifdef USE_XAA > if (pMga->AccelInfoRec) > XAADestroyInfoRec(pMga->AccelInfoRec); > #endif > -- > 1.7.6 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel
-- Matthieu Herrb _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
