diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:00 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:00 +0000 |
| commit | 63171bc9c854f8aeb53a6579a579e5371c5bcf63 (patch) | |
| tree | 634a525037dbccb79123db8e0e13c1a9d1fd3211 /src/ffb_accel.c | |
| parent | 68c56916d79bf06e26e01c3e84206edc928d9b51 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASE
Diffstat (limited to 'src/ffb_accel.c')
| -rw-r--r-- | src/ffb_accel.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |