[xsrc/trunk]: xsrc/external/mit Avoid dup inconsistent definitions.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/a54898489d73
branches:  trunk
changeset: 10095:a54898489d73
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jan 23 16:57:01 2019 +0000

description:
Avoid dup inconsistent definitions.

diffstat:

 external/mit/xorg-server/dist/randr/randrstr.h                  |  14 ++++++---
 external/mit/xorgproto/dist/include/X11/extensions/randrproto.h |   4 ++
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r c358c357ad40 -r a54898489d73 external/mit/xorg-server/dist/randr/randrstr.h
--- a/external/mit/xorg-server/dist/randr/randrstr.h    Tue Jan 22 20:25:45 2019 +0000
+++ b/external/mit/xorg-server/dist/randr/randrstr.h    Wed Jan 23 16:57:01 2019 +0000
@@ -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;
 
diff -r c358c357ad40 -r a54898489d73 external/mit/xorgproto/dist/include/X11/extensions/randrproto.h
--- a/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h   Tue Jan 22 20:25:45 2019 +0000
+++ b/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h   Wed Jan 23 16:57:01 2019 +0000
@@ -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