XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1

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;