diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:07 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:07 +0000 |
| commit | 0097b6fe2d1739e46e4e7726aaa481b6dc84870c (patch) | |
| tree | 5e279fda13b69a02c684338ee803defbda33ab08 /cfb/cfbfillsp.c | |
| parent | c57959ad6a4c0f5329762f401fd7871ffb2ee90c (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'cfb/cfbfillsp.c')
| -rw-r--r-- | cfb/cfbfillsp.c | 9 |
1 files changed, 7 insertions, 2 deletions
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 ) { |