diff options
Diffstat (limited to 'fb/fbscreen.c')
| -rw-r--r-- | fb/fbscreen.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fb/fbscreen.c b/fb/fbscreen.c index 2502efeff..fa518f64a 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -185,7 +185,6 @@ fbFinishScreenInit(ScreenPtr pScreen, * pixels. If you want real 24bit images, include a 24bpp * format in the pixmap formats */ -#ifdef FB_24_32BIT if (bpp == 24) { int f; @@ -205,8 +204,6 @@ fbFinishScreenInit(ScreenPtr pScreen, } } } -#endif -#ifdef FB_SCREEN_PRIVATE if (imagebpp == 32) { fbGetScreenPrivate(pScreen)->win32bpp = bpp; @@ -221,7 +218,6 @@ fbFinishScreenInit(ScreenPtr pScreen, fbGetScreenPrivate(pScreen)->setupWrap = setupWrap; fbGetScreenPrivate(pScreen)->finishWrap = finishWrap; #endif -#endif rootdepth = 0; if (!fbInitVisuals (&visuals, &depths, &nvisuals, &ndepths, &rootdepth, &defaultVisual,((unsigned long)1<<(imagebpp-1)), 8)) @@ -236,13 +232,11 @@ fbFinishScreenInit(ScreenPtr pScreen, return FALSE; /* overwrite miCloseScreen with our own */ pScreen->CloseScreen = fbCloseScreen; -#ifdef FB_24_32BIT if (bpp == 24 && imagebpp == 32) { pScreen->ModifyPixmapHeader = fb24_32ModifyPixmapHeader; pScreen->CreateScreenResources = fb24_32CreateScreenResources; } -#endif return TRUE; } |