xserver: Branch 'master'

[Adam Jackson]

 Xext/xace.h |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 524844c8c18e226aad30feb371b19ef491d83449
Author: Julien Cristau <jcristau at debian.org>
Date:   Tue Oct 27 13:23:13 2015 +0100

    Xext: fix build with --disable-xace
    
    Regression from 990cf5b2828f73dc7a07f1e38f608af39acfd81d
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Cc: Andrew Eikum <aeikum at codeweavers.com>
    Cc: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>

diff --git a/Xext/xace.h b/Xext/xace.h
index 3303f76..6a8d0c4 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -112,6 +112,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
 
 #ifdef __GNUC__
 #define XaceHook(args...) Success
+#define XaceHookIsSet(args...) 0
 #define XaceHookDispatch(args...) Success
 #define XaceHookPropertyAccess(args...) Success
 #define XaceHookSelectionAccess(args...) Success
@@ -119,6 +120,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
 #define XaceCensorImage(args...) { ; }
 #else
 #define XaceHook(...) Success
+#define XaceHookIsSet(...) 0
 #define XaceHookDispatch(...) Success
 #define XaceHookPropertyAccess(...) Success
 #define XaceHookSelectionAccess(...) Success