diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-07-18 18:16:12 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-18 18:17:38 -0400 |
| commit | 84683f19b4d1c712281036bcabf8dc623e64b26a (patch) | |
| tree | 94c61eca298da6f6200fcb8ba8a4d1009b1495b7 /mi | |
| parent | 881953813c7307f2aac4057b48d233e5f4a574cd (diff) | |
get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions. They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build. As well as
for miinitext.c. But largely gone.
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/Makefile.am | 2 | ||||
| -rw-r--r-- | mi/mibitblt.c | 2 | ||||
| -rw-r--r-- | mi/mipushpxl.c | 10 | ||||
| -rw-r--r-- | mi/miwideline.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/mi/Makefile.am b/mi/Makefile.am index c77eac709..42f75ae73 100644 --- a/mi/Makefile.am +++ b/mi/Makefile.am @@ -6,7 +6,7 @@ sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \ mispans.h miwideline.h mistruct.h mifpoly.h endif -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) # libminimi is for dmx - it has different defines for miinitext.c libminimi_la_SOURCES = \ diff --git a/mi/mibitblt.c b/mi/mibitblt.c index b7fb4cc5d..2bccc2fb4 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -360,7 +360,7 @@ miGetPlane( * Now get the bit and insert into a bitmap in XY format. */ bit = (pixel >> planeNum) & 1; -#ifndef XFree86Server +#if 0 /* XXX assuming bit order == byte order */ #if BITMAP_BIT_ORDER == LSBFirst bit <<= k; diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index 9cdb09af9..d83d2fc6a 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -95,7 +95,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) Bool fInBox; DDXPointRec pt[NPT], ptThisLine; int width[NPT]; -#ifdef XFree86Server +#if 1 PixelType startmask; if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) if (screenInfo.bitmapBitOrder == LSBFirst) @@ -135,7 +135,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) while(pw < pwEnd) { w = *pw; -#ifdef XFree86Server +#if 1 msk = startmask; #else msk = (MiBits)(-1) ^ SCRRIGHT((MiBits)(-1), 1); @@ -168,7 +168,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) fInBox = FALSE; } } -#ifdef XFree86Server +#if 1 /* This is not quite right, but it'll do for now */ if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) if (screenInfo.bitmapBitOrder == LSBFirst) @@ -191,7 +191,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) { /* Process final partial word on line */ w = *pw; -#ifdef XFree86Server +#if 1 msk = startmask; #else msk = (MiBits)(-1) ^ SCRRIGHT((MiBits)(-1), 1); @@ -224,7 +224,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) fInBox = FALSE; } } -#ifdef XFree86Server +#if 1 /* This is not quite right, but it'll do for now */ if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) if (screenInfo.bitmapBitOrder == LSBFirst) diff --git a/mi/miwideline.c b/mi/miwideline.c index 33170a305..3554e3e8e 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -2072,7 +2072,7 @@ miWideDash (pDrawable, pGC, mode, npt, pPts) Bool endIsFg = FALSE, startIsFg = FALSE; Bool firstIsFg = FALSE, prevIsFg = FALSE; -#ifndef XFree86Server +#if 0 /* XXX backward compatibility */ if (pGC->lineWidth == 0) { |