summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2015-07-13 15:04:57 +1200
committerAdam Jackson <ajax@redhat.com>2015-09-18 11:07:13 -0400
commit0c96bf03c7a4eb53c9f8f4fd6b734746154081e1 (patch)
treea6632f8fcf6d77c4c849c4ed574bbb65e301e335
parent79b63f0e57cd5baf06ff24252d3f1675dcb64467 (diff)
downloadxorg-proto-randrproto-0c96bf03c7a4eb53c9f8f4fd6b734746154081e1.tar.gz
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@canonical.com>
-rw-r--r--randrproto.h2
1 files changed, 0 insertions, 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_ */