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.anc...@canonical.com>
---
 randrproto.h | 2 --
 1 file changed, 2 deletions(-)

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_ */
-- 
2.1.4

_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to