xserver: Branch 'master'

[Adam Jackson]

 include/X11/extensions/randrproto.h |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 30a2013800296b354449706ebb01b51bc52cd388
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Mar 16 19:11:21 2018 -0400

    randrproto: Fix missing #undef RRLease
    
    clang did not like this, and it's hard to blame it:
    
    ../randr/randrstr.h:66:13: warning: redefinition of typedef 'CARD32' is a C11 feature [-Wtypedef-redefinition]
    typedef XID RRLease;
                ^
    /opt/X11/include/X11/extensions/randrproto.h:53:17: note: expanded from macro 'RRLease'
                    ^
    /opt/X11/include/X11/Xmd.h:111:23: note: previous definition is here
    typedef unsigned long CARD32;
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/include/X11/extensions/randrproto.h b/include/X11/extensions/randrproto.h
index 712c8b5..b0fd7f0 100644
--- a/include/X11/extensions/randrproto.h
+++ b/include/X11/extensions/randrproto.h
@@ -1126,6 +1126,7 @@ typedef struct {
 } xRRDeleteMonitorReq;
 #define sz_xRRDeleteMonitorReq	12
 
+#undef RRLease
 #undef RRModeFlags
 #undef RRCrtc
 #undef RRMode