summaryrefslogtreecommitdiff
path: root/src/ffb_accel.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:42 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:42 +0000
commit00f21f357a123a981d1ffaedc8e3a24b17f07cb0 (patch)
tree634a525037dbccb79123db8e0e13c1a9d1fd3211 /src/ffb_accel.c
parentd9ee679d756a1151893c58620ba396c0f2b3bdbf (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-012804-2330
Diffstat (limited to 'src/ffb_accel.c')
-rw-r--r--src/ffb_accel.c6
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;