From 63171bc9c854f8aeb53a6579a579e5371c5bcf63 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Wed, 26 Nov 2003 22:49:00 +0000 Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch --- src/ffb_accel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ffb_accel.c') diff --git a/src/ffb_accel.c b/src/ffb_accel.c index b8ce88b..9aeb71d 100644 --- a/src/ffb_accel.c +++ b/src/ffb_accel.c @@ -24,7 +24,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c,v 1.5 2001/03/03 22:41:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c,v 1.7 2003/11/10 18:22:31 tsi Exp $ */ #include "scrnintstr.h" #include "pixmapstr.h" @@ -148,7 +148,7 @@ CreatorDestroyWindow (WindowPtr pWin) extern CreatorStipplePtr FFB_tmpStipple; static int -CreatorChangeWindowAttributes (WindowPtr pWin, Mask mask) +CreatorChangeWindowAttributes (WindowPtr pWin, unsigned long mask) { FFBPtr pFfb = GET_FFB_FROM_SCREEN(pWin->drawable.pScreen); CreatorPrivWinPtr pFfbPrivWin; @@ -457,7 +457,7 @@ CreatorCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) FFBLOG(("CreatorCopyWindow: WIN(%p)\n", pWin)); - REGION_INIT(pScreen, &rgnDst, NullBox, 0); + REGION_NULL(pScreen, &rgnDst); dx = ptOldOrg.x - pWin->drawable.x; dy = ptOldOrg.y - pWin->drawable.y; -- cgit v1.2.3