summaryrefslogtreecommitdiff
path: root/cfb/cfbfillarc.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
commitadc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch)
tree23eb7becc5360b2cbe16aa8d45529880067f3989 /cfb/cfbfillarc.c
parent90f1536dd315cd265bfc7ef35058761a65a01734 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'cfb/cfbfillarc.c')
-rw-r--r--cfb/cfbfillarc.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c
index 9dee99476..64ec508c8 100644
--- a/cfb/cfbfillarc.c
+++ b/cfb/cfbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.5 2001/12/14 19:59:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
#include "X.h"
#include "Xprotostr.h"
-#include "miscstruct.h"
+#include "regionstr.h"
#include "gcstruct.h"
#include "pixmapstr.h"
#include "scrnintstr.h"
@@ -47,10 +47,10 @@ in this Software without prior written authorization from The Open Group.
#endif
static void
-RROP_NAME(cfbFillEllipseSolid) (pDraw, pGC, arc)
- DrawablePtr pDraw;
- GCPtr pGC;
- xArc *arc;
+RROP_NAME(cfbFillEllipseSolid)(
+ DrawablePtr pDraw,
+ GCPtr pGC,
+ xArc *arc)
{
STUPID int x, y, e;
STUPID int yk, xk, ym, xm, dx, dy, xorg, yorg;
@@ -181,6 +181,7 @@ RROP_NAME(cfbFillEllipseSolid) (pDraw, pGC, arc)
RROP_SOLID_MASK(addrl, endmask);
#endif /* PSZ == 24 */
}
+ RROP_UNDECLARE
}
#if PSZ == 24
@@ -254,10 +255,10 @@ RROP_NAME(cfbFillEllipseSolid) (pDraw, pGC, arc)
}
static void
-RROP_NAME(cfbFillArcSliceSolid)(pDraw, pGC, arc)
- DrawablePtr pDraw;
- GCPtr pGC;
- xArc *arc;
+RROP_NAME(cfbFillArcSliceSolid)(
+ DrawablePtr pDraw,
+ GCPtr pGC,
+ xArc *arc)
{
int yk, xk, ym, xm, dx, dy, xorg, yorg, slw;
register int x, y, e;
@@ -313,6 +314,7 @@ RROP_NAME(cfbFillArcSliceSolid)(pDraw, pGC, arc)
FILLSLICESPANS(slice.flip_bot, addrlb);
}
}
+ RROP_UNDECLARE
}
void