xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/modes/xf86Crtc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 147b4602f9c47e8977d13b1cbb6566f86dba8647
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Sep 25 15:06:44 2017 -0400

    xfree86: Hush some warnings when Xv is disabled
    
    Spotted by Appveyor:
    
    xf86Crtc.c:3281:1: warning: ‘xf86_crtc_box_area’ defined but not used [-Wunused-function]
     xf86_crtc_box_area(BoxPtr box)
     ^~~~~~~~~~~~~~~~~~
    xf86Crtc.c:3268:1: warning: ‘x86_crtc_box’ defined but not used [-Wunused-function]
     x86_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box)
     ^~~~~~~~~~~~
    xf86Crtc.c:3256:1: warning: ‘x86_crtc_box_intersect’ defined but not used [-Wunused-function]
     x86_crtc_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b)
     ^~~~~~~~~~~~~~~~~~~~~~
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index fa404d9d4..1a401af4b 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -3252,6 +3252,7 @@ xf86ConnectorGetName(xf86ConnectorType connector)
     return _xf86ConnectorNames[connector];
 }
 
+#ifdef XV
 static void
 x86_crtc_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b)
 {
@@ -3283,7 +3284,6 @@ xf86_crtc_box_area(BoxPtr box)
     return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
 }
 
-#ifdef XV
 /*
  * Return the crtc covering 'box'. If two crtcs cover a portion of
  * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc