From 9105cd947989db96a61c83493c44a336bf10a18c Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon, 17 Nov 2003 19:03:47 +0000
Subject: merge XFree86 4.3.0.1 to -CURRENT

---
 do_tris.c | 75 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 35 insertions(+), 40 deletions(-)

(limited to 'do_tris.c')

diff --git a/do_tris.c b/do_tris.c
index 836c6ef..d8b0c3b 100644
--- a/do_tris.c
+++ b/do_tris.c
@@ -21,6 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_tris.c,v 1.5 2001/01/17 23:45:12 dawes Exp $ */
 
 
 #undef POLYTRIANGLE_HACK    /* don't use this code */
@@ -41,23 +42,23 @@ static GC     pgc;
 #define PI  3.14159265357989
 #endif
 
-double Area(p1, p2, p3)
-    XPoint  p1, p2, p3;
+static double 
+Area(XPoint p1, XPoint p2, XPoint p3)
 {
     return
       (p1.x*p2.y - p1.x*p3.y + p2.x*p3.y - p2.x*p1.y + p3.x*p1.y - p3.x*p2.y)/2;
 }
 
-double Distance(p1, p2)
-    XPoint p1, p2;
+/*
+static double 
+Distance(XPoint p1, XPoint p2)
 {
     return sqrt((float) ((p1.x-p2.x)*(p1.x-p2.x) + (p1.y-p2.y)*(p1.y-p2.y)));
 }
+*/
     
-int InitTriangles(xp, p, reps)
-    XParms  xp;
-    Parms   p;
-    int     reps;
+int 
+InitTriangles(XParms xp, Parms p, int reps)
 {
     int     i, j, numPoints;
     int     rows;
@@ -132,10 +133,8 @@ int InitTriangles(xp, p, reps)
 
 #ifndef POLYTRIANGLE_HACK
 
-void DoTriangles(xp, p, reps)
-    XParms  xp;
-    Parms   p;
-    int     reps;
+void 
+DoTriangles(XParms xp, Parms p, int reps)
 {
     int     i, j;
     XPoint  *curPoint;
@@ -151,40 +150,20 @@ void DoTriangles(xp, p, reps)
             pgc = xp->fggc;
         else
             pgc = xp->bggc;
+	CheckAbort ();
     }
 }
 
 #else
-void DoTriangles(xp, p, reps)
-    XParms  xp;
-    Parms   p;
-    int     reps;
-{
-    int     i, j;
-    XPoint  *curPoint;
-
-    for (i = 0; i != reps; i++) {
-        XPolyTriangle (xp->d, xp->w, pgc, points, p->objects, Convex, 
-			 CoordModeOrigin);
-        if (pgc == xp->bggc)
-            pgc = xp->fggc;
-        else
-            pgc = xp->bggc;
-    }
-}
 
 static xReq _dummy_request = {
 	0, 0, 0
 };
 
-XPolyTriangle(dpy, d, gc, points, n_triangles, shape, mode)
-register Display *dpy;
-Drawable d;
-GC gc;
-XPoint *points;
-int n_triangles;
-int shape;
-int mode;
+static void
+XPolyTriangle(register Display *dpy, 
+	      Drawable d, GC gc, XPoint *points, 
+	      int n_triangles, int shape, int mode)
 {
     register xFillPolyReq *req;
     register long nbytes;
@@ -228,11 +207,27 @@ int mode;
     UnlockDisplay(dpy);
     SyncHandle();
 }
+
+void 
+DoTriangles(XParms xp, Parms p, int reps)
+{
+    int     i, j;
+    XPoint  *curPoint;
+
+    for (i = 0; i != reps; i++) {
+        XPolyTriangle (xp->d, xp->w, pgc, points, p->objects, Convex, 
+			 CoordModeOrigin);
+        if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
 #endif
 
-void EndTriangles(xp, p)
-    XParms  xp;
-    Parms   p;
+void 
+EndTriangles(XParms xp, Parms p)
 {
     free(points);
 }
-- 
cgit v1.2.3