summaryrefslogtreecommitdiff
path: root/cfb/cfbrrop.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:49:22 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:49:22 +0000
commitd568221710959cf7d783e6ff0fb80fb43a231124 (patch)
tree8d6f039393294c6ffac8533639afdebe5d68bfc1 /cfb/cfbrrop.c
parent9508a382f8a9f241dab097d921b6d290c1c3a776 (diff)
XFree86 4.3.0.1
Diffstat (limited to 'cfb/cfbrrop.c')
-rw-r--r--cfb/cfbrrop.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c
index 69ec0278d..1ee6771e0 100644
--- a/cfb/cfbrrop.c
+++ b/cfb/cfbrrop.c
@@ -25,6 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
+/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */
/* cfb reduced rasterop computations */
@@ -123,10 +124,10 @@ in this Software without prior written authorization from The Open Group.
int
cfbReduceRasterOp (rop, fg, pm, andp, xorp)
int rop;
- unsigned long fg, pm;
- unsigned long *andp, *xorp;
+ CfbBits fg, pm;
+ CfbBits *andp, *xorp;
{
- unsigned long and, xor;
+ CfbBits and, xor;
int rrop;
fg = PFILL (fg);
@@ -197,6 +198,9 @@ cfbReduceRasterOp (rop, fg, pm, andp, xorp)
and = 0;
xor = ~0;
break;
+ default:
+ and = xor = 0;
+ break;
}
and |= ~pm;
xor &= pm;