From c52a2b1ebad56820af932dfbc871701a8b04fd9c Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 11 Nov 2014 12:30:07 -0500
Subject: [PATCH] mi: Fix regression in arc drawing

xts' XDrawArcs/15 regressed (turning into a server-side infinite loop)
after:

    commit 7679afd4da8b86aed27e5916ba723116a3c8bb4a
    Author: Adam Jackson <ajax@redhat.com>
    Date:   Fri Sep 26 12:01:37 2014 -0400

        mi: Fold mifpolycon.c into miarc.c

The reason is miarc.c provided its own definitions (sigh) of min/max,
that both accept int arguments and return an int.  Since miFillSppPoly
uses a double (sigh) and some min-involving math for its loop index
variable, things do not go well.

Since the integer versions of min/max are redundant, nuke 'em.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 mi/miarc.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/mi/miarc.c b/mi/miarc.c
index 288bea326..e8bc87e3e 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -115,21 +115,6 @@ cbrt(double x)
  *
  */
 
-#undef max
-#undef min
-
-_X_INLINE static int
-max(const int x, const int y)
-{
-    return x > y ? x : y;
-}
-
-_X_INLINE static int
-min(const int x, const int y)
-{
-    return x < y ? x : y;
-}
-
 struct bound {
     double min, max;
 };