Module Name: xsrc
Committed By: christos
Date: Wed Jan 23 16:57:01 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server/dist/randr: randrstr.h
xsrc/external/mit/xorgproto/dist/include/X11/extensions: randrproto.h
Log Message:
Avoid dup inconsistent definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/randr/randrstr.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/randr/randrstr.h
diff -u xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.5 xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.6
--- xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.5 Mon Dec 31 04:50:02 2018
+++ xsrc/external/mit/xorg-server/dist/randr/randrstr.h Wed Jan 23 11:57:01 2019
@@ -59,11 +59,15 @@
#define RANDR_INTERFACE_VERSION 0x0104
-typedef XID RRMode;
-typedef XID RROutput;
-typedef XID RRCrtc;
-typedef XID RRProvider;
-typedef XID RRLease;
+/* All also defined in <X11/extensions/randrproto.h> */
+#ifndef RROutput
+#define RROutput CARD32
+#define RRMode CARD32
+#define RRCrtc CARD32
+#define RRProvider CARD32
+#define RRModeFlags CARD32
+#define RRLease CARD32
+#endif
extern int RREventBase, RRErrorBase;
Index: xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h
diff -u xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h:1.1.1.1 xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h:1.2
--- xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h:1.1.1.1 Wed Mar 14 03:25:46 2018
+++ xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h Wed Jan 23 11:57:01 2019
@@ -45,12 +45,16 @@
#define Time CARD32
#define KeyCode CARD8
#define KeySym CARD32
+
+/* All also defined in <randr/randrstr.h> */
+#ifndef RROutput
#define RROutput CARD32
#define RRMode CARD32
#define RRCrtc CARD32
#define RRProvider CARD32
#define RRModeFlags CARD32
#define RRLease CARD32
+#endif
#define Rotation CARD16
#define SizeID CARD16
