From 926ab72a93d44a76c3d30d0f8a7db020ba4e3313 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Fri, 18 Jul 2008 16:24:50 -0300 Subject: [PATCH] Remove dependency on xf1bpp and xf4bpp Not just don't include the header files. --- src/tseng_driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/tseng_driver.c b/src/tseng_driver.c index 67cc231..46fc3ae 100644 --- a/src/tseng_driver.c +++ b/src/tseng_driver.c @@ -1453,18 +1453,22 @@ TsengScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) */ switch (pScrn->bitsPerPixel) { +#if HAVE_XF1BPP case 1: ret = xf1bppScreenInit(pScreen, pTseng->FbBase, pScrn->virtualX, pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth); break; +#endif +#if HAVE_XF4BPP case 4: ret = xf4bppScreenInit(pScreen, pTseng->FbBase, pScrn->virtualX, pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth); break; +#endif default: ret = fbScreenInit(pScreen, pTseng->FbBase, pScrn->virtualX, pScrn->virtualY, @@ -1493,8 +1497,10 @@ TsengScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } } +#if HAVE_XF1BPP /* must be after RGB ordering fixed */ if (pScrn->bitsPerPixel > 4) +#endif fbPictureInit(pScreen, 0, 0); if (pScrn->depth >= 8) -- 1.5.6