svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 6 insertions, 11 deletions

diff --git a/xorg-server/mi/mizerclip.c b/xorg-server/mi/mizerclip.c
index b167c5475..dd05040bc 100644
--- a/xorg-server/mi/mizerclip.c
+++ b/xorg-server/mi/mizerclip.c
@@ -405,17 +405,12 @@ the numerator is therefore (2^32 - 1), which does not overflow an unsigned
  *
  */
 _X_EXPORT int
-miZeroClipLine(xmin, ymin, xmax, ymax,
-	       new_x1, new_y1, new_x2, new_y2,
-	       adx, ady,
-	       pt1_clipped, pt2_clipped, octant, bias, oc1, oc2)
-    int xmin, ymin, xmax, ymax;
-    int *new_x1, *new_y1, *new_x2, *new_y2;
-    int *pt1_clipped, *pt2_clipped;
-    unsigned int adx, ady;
-    int octant;
-    unsigned int bias;
-    int oc1, oc2;
+miZeroClipLine(int xmin, int ymin, int xmax, int ymax,
+               int *new_x1, int *new_y1, int *new_x2, int *new_y2,
+               unsigned int adx, unsigned int ady,
+               int *pt1_clipped, int *pt2_clipped,
+               int octant, unsigned int bias,
+               int oc1, int oc2)
 {
     int swapped = 0;
     int clipDone = 0;