summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrws <empty>1989-11-25 12:11:01 +0000
committerrws <empty>1989-11-25 12:11:01 +0000
commit96ba204ec74aaef38021cab4d01e3e1331915d8c (patch)
tree88ba33401fd2dcb5ea80c1e2851156df6a523fc5
parentc4b83d554c72bb3ff4ea4613fe461e815e8e3bf6 (diff)
lint
-rw-r--r--xc/programs/Xserver/dix/grabs.c4
-rw-r--r--xc/programs/Xserver/mi/miwideline.c6
2 files changed, 3 insertions, 7 deletions
diff --git a/xc/programs/Xserver/dix/grabs.c b/xc/programs/Xserver/dix/grabs.c
index 90fe7a5b6..2fa39a144 100644
--- a/xc/programs/Xserver/dix/grabs.c
+++ b/xc/programs/Xserver/dix/grabs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: grabs.c,v 5.4 89/10/03 19:56:26 rws Exp $ */
+/* $XConsortium: grabs.c,v 5.5 89/10/04 22:50:55 rws Exp $ */
/************************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@@ -347,7 +347,7 @@ DeletePassiveGrabFromList(pMinuendGrab)
(Bool)grab->keyboardMode,
(Bool)grab->pointerMode,
grab->modifierDevice,
- AnyModifier, grab->type,
+ AnyModifier, (int)grab->type,
pMinuendGrab->detail.exact,
grab->confineTo, grab->cursor);
if (!pNewGrab)
diff --git a/xc/programs/Xserver/mi/miwideline.c b/xc/programs/Xserver/mi/miwideline.c
index 47abbb3ee..073f37dba 100644
--- a/xc/programs/Xserver/mi/miwideline.c
+++ b/xc/programs/Xserver/mi/miwideline.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: miwideline.c,v 1.23 89/11/16 19:39:30 keith Exp $
+ * $XConsortium: miwideline.c,v 1.24 89/11/19 17:26:17 rws Exp $
*
* Copyright 1988 Massachusetts Institute of Technology
*
@@ -240,7 +240,6 @@ miPolyBuildPoly (vertices, slopes, count, xi, yi, left, right, pnleft, pnright,
{
int top, bottom;
double miny, maxy;
- double k;
register int i;
int j;
int clockwise;
@@ -779,11 +778,9 @@ miRoundJoinClip (pLeft, pRight, edge1, edge2, y1, y2, left1, left2)
Bool *left1, *left2;
{
int denom;
- int swapslopes;
denom = - pLeft->dx * pRight->dy + pRight->dx * pLeft->dy;
- swapslopes = 0;
if (denom >= 0)
{
pLeft->xa = -pLeft->xa;
@@ -791,7 +788,6 @@ miRoundJoinClip (pLeft, pRight, edge1, edge2, y1, y2, left1, left2)
}
else
{
- swapslopes = 1;
pRight->xa = -pRight->xa;
pRight->ya = -pRight->ya;
}