xserver: Branch 'master'

[Keith Packard]

 dix/window.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit fe7463b8ce0de301c2f82b108c93963424f77219
Author: Julien Cristau <jcristau at debian.org>
Date:   Sat Jul 27 12:09:07 2013 +0200

    dix: add missing include for DeleteWindowFromAnySelections
    
    Fixes build error with XACE disabled:
    window.c:886:5: error: implicit declaration of function 'DeleteWindowFromAnySelections' [-Werror=implicit-function-declaration]
         DeleteWindowFromAnySelections(pWin);
         ^
    
    Debian bug#701372
    
    Reported-by: Matthias Klose <doko at debian.org>
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/window.c b/dix/window.c
index 8950f97..9fa51c2 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -126,6 +126,7 @@ Equipment Corporation.
 #ifdef COMPOSITE
 #include "compint.h"
 #endif
+#include "selection.h"
 
 #include "privates.h"
 #include "xace.h"