proto/randrproto: Branch 'master'

[Adam Jackson]

 randrproto.h |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 0c96bf03c7a4eb53c9f8f4fd6b734746154081e1
Author: Robert Ancell <robert.ancell at canonical.com>
Date:   Mon Jul 13 15:04:57 2015 +1200

    randrproto: remove duplicate definition of Atom type
    
    The Atom type was defined a second time with the 1.5 changes. It was already
    previously defined to be a CARD32.
    
    Signed-off-by: Robert Ancell <robert.ancell at canonical.com>

diff --git a/randrproto.h b/randrproto.h
index 114a624..48be7aa 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -50,7 +50,6 @@
 #define RRCrtc CARD32
 #define RRProvider CARD32
 #define RRModeFlags CARD32
-#define Atom CARD32
 
 #define Rotation CARD16
 #define SizeID CARD16
@@ -1091,6 +1090,5 @@ typedef struct {
 #undef Rotation
 #undef SizeID
 #undef SubpixelOrder
-#undef Atom
 
 #endif /* _XRANDRP_H_ */