summaryrefslogtreecommitdiff
path: root/cfb/cfbfillsp.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
commitadc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch)
tree23eb7becc5360b2cbe16aa8d45529880067f3989 /cfb/cfbfillsp.c
parent90f1536dd315cd265bfc7ef35058761a65a01734 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'cfb/cfbfillsp.c')
-rw-r--r--cfb/cfbfillsp.c9
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 ) {