From 0097b6fe2d1739e46e4e7726aaa481b6dc84870c Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Wed, 26 Nov 2003 22:49:07 +0000 Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch --- cfb/cfbfillsp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'cfb/cfbfillsp.c') diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c index 9a75ac6c6..14a6a9d52 100644 --- a/cfb/cfbfillsp.c +++ b/cfb/cfbfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.7 2001/12/14 19:59:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -509,7 +509,10 @@ int fSorted; width = *pwidth; while(width > 0) { - int xtemp, tmpx; + int xtemp; +#if PSZ != 32 || PPW != 1 + int tmpx; +#endif register CfbBits *ptemp; register CfbBits *pdsttmp; /* @@ -541,7 +544,9 @@ int fSorted; tmpx = x & 3; pdsttmp = pdst + ((x * 3)>>2); #else +#if PSZ != 32 || PPW != 1 tmpx = x & PIM; +#endif pdsttmp = pdst + (x>>PWSH); #endif switch ( pGC->fillStyle ) { -- cgit v1.2.3