xserver: Branch 'master'

[Keith Packard]

 mi/miarc.c |   15 ---------------
 1 file changed, 15 deletions(-)

New commits:
commit c52a2b1ebad56820af932dfbc871701a8b04fd9c
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Nov 11 12:30:07 2014 -0500

    mi: Fix regression in arc drawing
    
    xts' XDrawArcs/15 regressed (turning into a server-side infinite loop)
    after:
    
        commit 7679afd4da8b86aed27e5916ba723116a3c8bb4a
        Author: Adam Jackson <ajax at 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 at redhat.com>
    Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
    Tested-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/mi/miarc.c b/mi/miarc.c
index 288bea3..e8bc87e 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;
 };