mi: kill a few warnings

This commit is contained in:
Maarten Maathuis 2009-02-07 20:47:54 +01:00
parent 00226d0b58
commit d591c7d1b8
4 changed files with 5 additions and 4 deletions

View File

@ -1884,7 +1884,7 @@ miComputeArcs (
int arcsJoin; int arcsJoin;
int selfJoin; int selfJoin;
int iDash = 0, dashRemaining; int iDash = 0, dashRemaining = 0;
int iDashStart = 0, dashRemainingStart = 0, iphaseStart; int iDashStart = 0, dashRemainingStart = 0, iphaseStart;
int startAngle, spanAngle, endAngle, backwards = 0; int startAngle, spanAngle, endAngle, backwards = 0;
int prevDashAngle, dashAngle; int prevDashAngle, dashAngle;

View File

@ -120,7 +120,7 @@ extern _X_EXPORT void miSetZeroLineBias(
t = y1; y1 = y2; y2 = t;\ t = y1; y1 = y2; y2 = t;\
} }
#define miGetZeroLineBias(_pScreen) ((unsigned long) \ #define miGetZeroLineBias(_pScreen) ((unsigned long) (unsigned long*)\
dixLookupPrivate(&(_pScreen)->devPrivates, miZeroLineScreenKey)) dixLookupPrivate(&(_pScreen)->devPrivates, miZeroLineScreenKey))
#define CalcLineDeltas(_x1,_y1,_x2,_y2,_adx,_ady,_sx,_sy,_SX,_SY,_octant) \ #define CalcLineDeltas(_x1,_y1,_x2,_y2,_adx,_ady,_sx,_sy,_SX,_SY,_octant) \

View File

@ -308,5 +308,6 @@ DevPrivateKey miZeroLineScreenKey = &miZeroLineScreenKeyIndex;
void void
miSetZeroLineBias(ScreenPtr pScreen, unsigned int bias) miSetZeroLineBias(ScreenPtr pScreen, unsigned int bias)
{ {
dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)bias); dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey,
(unsigned long *)(unsigned long)bias);
} }

View File

@ -709,7 +709,7 @@ miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
int n, maxw = 0; int n, maxw = 0;
xArc *arc; xArc *arc;
int i; int i;
DDXPointPtr points, pts, oddPts; DDXPointPtr points, pts, oddPts = NULL;
DDXPointPtr pt; DDXPointPtr pt;
int numPts; int numPts;
Bool dospans; Bool dospans;