xserver: Branch 'master' - 2 commits

[Keith Packard]

 include/dixfont.h |    1 +
 mi/miwideline.c   |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bca4f4b56c7619d17f9df46f7aac392ea01a9429
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Aug 17 18:37:10 2015 -0700

    mi: Always initialize edge1 and edge2 in miLineArc
    
    This eliminates a warning generated when miLineArcD is inlined and the
    compiler can't figure out that edge1 and edge2 are always initialized
    before being used.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Dave Airlie <airlied at redhat.com>

diff --git a/mi/miwideline.c b/mi/miwideline.c
index 3baa99b..54de1d3 100644
--- a/mi/miwideline.c
+++ b/mi/miwideline.c
@@ -1454,7 +1454,7 @@ miLineArc(DrawablePtr pDraw,
     int xorgi = 0, yorgi = 0;
     Spans spanRec;
     int n;
-    PolyEdgeRec edge1, edge2;
+    PolyEdgeRec edge1 = { 0 }, edge2 = { 0 };
     int edgey1, edgey2;
     Bool edgeleft1, edgeleft2;
 
commit 5daf1295cb4f71510da595721d10f7ea3b74d1b9
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Aug 17 18:35:20 2015 -0700

    dixfont.h: Include fontutil.h before GetGlyphs is #defined
    
    This eliminates the duplicate declaration of dixGetGlyphs when
    fontutil.h gets included after dixfont.h has defined GetGlyphs as
    dixGetGlyphs.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Dave Airlie <airlied at redhat.com>

diff --git a/include/dixfont.h b/include/dixfont.h
index 1895509..b44996f 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -29,6 +29,7 @@ SOFTWARE.
 #include "closure.h"
 #include <X11/fonts/fontstruct.h>
 #include <X11/fonts/fontproto.h>
+#include <X11/fonts/fontutil.h>
 
 #define NullDIXFontProp ((DIXFontPropPtr)0)