xserver: Branch 'master'

[Keith Packard]

 Xext/xvmain.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63bb5c5ef16edf652179770294dcca4fc07dc992
Author: Thierry Reding <treding at nvidia.com>
Date:   Wed Oct 29 16:59:27 2014 +0100

    xv: Add missing gcstruct.h include
    
    Commit ea3f3b0786d5 (xv: Move xf86 XV color key helper to core.) added
    code that uses internals of struct _GC. This structure is defined in the
    include/gcstruct.h header which wasn't included by the source file, only
    gc.h was. That caused the following build failure:
    
    	  CC       xvmain.lo
    	Xext/xvmain.c: In function 'XvFillColorKey':
    	Xext/xvmain.c:1114:13: error: dereferencing pointer to incomplete type
    	         (*gc->ops->PolyFillRect) (pDraw, gc, nbox, rects);
    	             ^
    
    Fix this by including the correct header file.
    
    Signed-off-by: Thierry Reding <treding at nvidia.com>
    Tested-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index bc176c8..1f42440 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -86,7 +86,7 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
-#include "gc.h"
+#include "gcstruct.h"
 #include "extnsionst.h"
 #include "extinit.h"
 #include "dixstruct.h"