summaryrefslogtreecommitdiff
path: root/src/ffb_gc.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:00 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:00 +0000
commit63171bc9c854f8aeb53a6579a579e5371c5bcf63 (patch)
tree634a525037dbccb79123db8e0e13c1a9d1fd3211 /src/ffb_gc.c
parent68c56916d79bf06e26e01c3e84206edc928d9b51 (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASE
Diffstat (limited to 'src/ffb_gc.c')
-rw-r--r--src/ffb_gc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ffb_gc.c b/src/ffb_gc.c
index 235f649..59cde91 100644
--- a/src/ffb_gc.c
+++ b/src/ffb_gc.c
@@ -24,7 +24,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c,v 1.3 2000/12/01 00:24:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c,v 1.4 2003/06/23 17:35:48 eich Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
@@ -444,7 +444,7 @@ CreatorNewFillArea(GCPtr pGC, cfbPrivGCPtr devPriv, CreatorPrivGCPtr gcPriv, int
}
void
-CreatorValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable)
+CreatorValidateGC (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
{
int mask; /* stateChanges */
int new_rrop;