Update to xserver 1.12.2. tested by naddy@, krw@, mpi@.

1 files changed, 33 insertions, 47 deletions

diff --git a/xserver/mi/mipoly.h b/xserver/mi/mipoly.h
index d94796e2f..e37fb48a2 100644
--- a/xserver/mi/mipoly.h
+++ b/xserver/mi/mipoly.h
@@ -26,7 +26,6 @@ from The Open Group.
 
 */
 
-
 /*
  *     fill.h
  *
@@ -83,32 +82,29 @@ from The Open Group.
  * for the winding number rule
  */
 #define CLOCKWISE          1
-#define COUNTERCLOCKWISE  -1 
+#define COUNTERCLOCKWISE  -1
 
 typedef struct _EdgeTableEntry {
-     int ymax;             /* ycoord at which we exit this edge. */
-     BRESINFO bres;        /* Bresenham info to run the edge     */
-     struct _EdgeTableEntry *next;       /* next in the list     */
-     struct _EdgeTableEntry *back;       /* for insertion sort   */
-     struct _EdgeTableEntry *nextWETE;   /* for winding num rule */
-     int ClockWise;        /* flag for winding number rule       */
+    int ymax;                   /* ycoord at which we exit this edge. */
+    BRESINFO bres;              /* Bresenham info to run the edge     */
+    struct _EdgeTableEntry *next;       /* next in the list     */
+    struct _EdgeTableEntry *back;       /* for insertion sort   */
+    struct _EdgeTableEntry *nextWETE;   /* for winding num rule */
+    int ClockWise;              /* flag for winding number rule       */
 } EdgeTableEntry;
 
-
-typedef struct _ScanLineList{
-     int scanline;              /* the scanline represented */
-     EdgeTableEntry *edgelist;  /* header node              */
-     struct _ScanLineList *next;  /* next in the list       */
+typedef struct _ScanLineList {
+    int scanline;               /* the scanline represented */
+    EdgeTableEntry *edgelist;   /* header node              */
+    struct _ScanLineList *next; /* next in the list       */
 } ScanLineList;
 
-
 typedef struct {
-     int ymax;                 /* ymax for the polygon     */
-     int ymin;                 /* ymin for the polygon     */
-     ScanLineList scanlines;   /* header node              */
+    int ymax;                   /* ymax for the polygon     */
+    int ymin;                   /* ymin for the polygon     */
+    ScanLineList scanlines;     /* header node              */
 } EdgeTable;
 
-
 /*
  * Here is a struct to help with storage allocation
  * so we can allocate a big chunk at a time, and then take
@@ -117,8 +113,8 @@ typedef struct {
 #define SLLSPERBLOCK 25
 
 typedef struct _ScanLineListBlock {
-     ScanLineList SLLs[SLLSPERBLOCK];
-     struct _ScanLineListBlock *next;
+    ScanLineList SLLs[SLLSPERBLOCK];
+    struct _ScanLineListBlock *next;
 } ScanLineListBlock;
 
 /*
@@ -126,7 +122,6 @@ typedef struct _ScanLineListBlock {
  * to scanlines() :  Must be an even number
  */
 #define NUMPTSTOBUFFER 200
-
 
 /*
  *
@@ -156,7 +151,6 @@ typedef struct _ScanLineListBlock {
    } \
 }
 
-
 /*
  *     Evaluate the given edge at the given scanline.
  *     If the edge has expired, then we leave it and fix up
@@ -180,28 +174,20 @@ typedef struct _ScanLineListBlock {
 
 /* mipolyutil.c */
 
-extern _X_EXPORT Bool miCreateETandAET(
-    int /*count*/,
-    DDXPointPtr /*pts*/,
-    EdgeTable * /*ET*/,
-    EdgeTableEntry * /*AET*/,
-    EdgeTableEntry * /*pETEs*/,
-    ScanLineListBlock * /*pSLLBlock*/
-);
-
-extern _X_EXPORT void miloadAET(
-    EdgeTableEntry * /*AET*/,
-    EdgeTableEntry * /*ETEs*/
-);
-
-extern _X_EXPORT void micomputeWAET(
-    EdgeTableEntry * /*AET*/
-);
-
-extern _X_EXPORT int miInsertionSort(
-    EdgeTableEntry * /*AET*/
-);
-
-extern _X_EXPORT void miFreeStorage(
-    ScanLineListBlock * /*pSLLBlock*/
-);
+extern _X_EXPORT Bool miCreateETandAET(int /*count */ ,
+                                       DDXPointPtr /*pts */ ,
+                                       EdgeTable * /*ET*/,
+                                       EdgeTableEntry * /*AET*/,
+                                       EdgeTableEntry * /*pETEs */ ,
+                                       ScanLineListBlock *      /*pSLLBlock */
+    );
+
+extern _X_EXPORT void miloadAET(EdgeTableEntry * /*AET*/, EdgeTableEntry *      /*ETEs */
+    );
+
+extern _X_EXPORT void micomputeWAET(EdgeTableEntry * /*AET*/);
+
+extern _X_EXPORT int miInsertionSort(EdgeTableEntry * /*AET*/);
+
+extern _X_EXPORT void miFreeStorage(ScanLineListBlock * /*pSLLBlock */
+    );