Fix X interface from polluting engine code completion

Source/ThirdParty/X11/X.h

@@ -1,6 +1,6 @@
 /* Definitions for the X window system likely to be used by applications */
 
-#ifndef X_H
+#if !defined(X_H) && !defined(_MSC_VER)
 #define X_H
 
 /***********************************************************

Source/ThirdParty/X11/Xproto.h

@@ -246,7 +246,7 @@ restoring the definitions in X.h.  */
 #define GContext CARD32
 #define Atom CARD32
 #define VisualID CARD32
-#define Time CARD32
+#define XXTime CARD32
 #define KeyCode CARD8
 #define KeySym CARD32
 
@@ -1002,7 +1002,7 @@ typedef struct _xEvent {
 	    } u;
 	struct {
             CARD32 pad00 B32;
-	    Time time B32;
+	    XXTime time B32;
 	    Window root B32, event B32, child B32;
 	    INT16 rootX B16, rootY B16, eventX B16, eventY B16;
 	    KeyButMask state B16;
@@ -1011,7 +1011,7 @@ typedef struct _xEvent {
 	} keyButtonPointer;
 	struct {
             CARD32 pad00 B32;
-            Time time B32;
+            XXTime time B32;
 	    Window root B32, event B32, child B32;
 	    INT16 rootX B16, rootY B16, eventX B16, eventY B16;
 	    KeyButMask state B16;
@@ -1137,26 +1137,26 @@ typedef struct _xEvent {
             CARD32 pad00 B32;
 	    Window window B32;
 	    Atom atom B32;
-	    Time time B32;
+	    XXTime time B32;
 	    BYTE state;			/* NewValue or Deleted */
 	    BYTE pad1;
 	    CARD16 pad2 B16;
 	} property;
 	struct {
             CARD32 pad00 B32;
-            Time time B32;     
+            XXTime time B32;     
 	    Window window B32;
 	    Atom atom B32;
 	} selectionClear;
 	struct {
             CARD32 pad00 B32;
-            Time time B32;    
+            XXTime time B32;    
 	    Window owner B32, requestor B32;
 	    Atom selection B32, target B32, property B32;
 	} selectionRequest;
 	struct {
             CARD32 pad00 B32;
-            Time time B32;   
+            XXTime time B32;   
 	    Window requestor B32;
 	    Atom selection B32, target B32, property B32;
 	} selectionNotify;
@@ -1434,7 +1434,7 @@ typedef struct {
     CARD16 length B16;
     Window window B32;
     Atom selection B32;
-    Time time B32;
+    XXTime time B32;
 } xSetSelectionOwnerReq;
 
 typedef struct {
@@ -1443,7 +1443,7 @@ typedef struct {
     CARD16 length B16;
     Window requestor B32;
     Atom selection B32, target B32, property B32;
-    Time time B32;
+    XXTime time B32;
     } xConvertSelectionReq;
 
 typedef struct {
@@ -1464,7 +1464,7 @@ typedef struct {
     BYTE pointerMode, keyboardMode;
     Window confineTo B32;
     Cursor cursor B32;
-    Time time B32;
+    XXTime time B32;
 } xGrabPointerReq;
 
 typedef struct {
@@ -1495,7 +1495,7 @@ typedef struct {
     BYTE pad;
     CARD16 length B16;
     Cursor cursor B32;
-    Time time B32;
+    XXTime time B32;
     CARD16 eventMask B16;
     CARD16 pad2 B16;
 } xChangeActivePointerGrabReq;
@@ -1505,7 +1505,7 @@ typedef struct {
     BOOL ownerEvents;
     CARD16 length B16;
     Window grabWindow B32;
-    Time time B32;
+    XXTime time B32;
     BYTE pointerMode, keyboardMode;  
     CARD16 pad B16;
 } xGrabKeyboardReq;
@@ -1534,7 +1534,7 @@ typedef struct {
     CARD8 reqType;
     CARD8 mode;
     CARD16 length B16;
-    Time time B32;
+    XXTime time B32;
 } xAllowEventsReq;
 
 typedef struct {
@@ -1542,7 +1542,7 @@ typedef struct {
     BYTE pad;
     CARD16 length B16;
     Window window B32;
-    Time start B32, stop B32;
+    XXTime start B32, stop B32;
 } xGetMotionEventsReq;
 
 typedef struct {
@@ -1568,7 +1568,7 @@ typedef struct {
     CARD8 revertTo;
     CARD16 length B16;
     Window focus B32;
-    Time time B32;
+    XXTime time B32;
 } xSetInputFocusReq;
 
 typedef struct {

Source/ThirdParty/X11/extensions/XI2proto.h

@@ -64,7 +64,7 @@
 
 /* make sure types have right sizes for protocol structures. */
 #define Window  uint32_t
-#define Time    uint32_t
+#define XXTime    uint32_t
 #define Atom    uint32_t
 #define Cursor  uint32_t
 #define Barrier uint32_t
@@ -545,7 +545,7 @@ typedef struct {
     uint8_t     ReqType;                /**< Always ::X_XISetFocus */
     uint16_t    length;                 /**< Length in 4 byte units */
     Window      focus;
-    Time        time;
+    XXTime        time;
     uint16_t    deviceid;
     uint16_t    pad0;
 } xXISetFocusReq;
@@ -586,7 +586,7 @@ typedef struct {
     uint8_t     ReqType;                /**< Always ::X_XIGrabDevice */
     uint16_t    length;                 /**< Length in 4 byte units */
     Window      grab_window;
-    Time        time;
+    XXTime        time;
     Cursor      cursor;
     uint16_t    deviceid;
     uint8_t     grab_mode;
@@ -631,7 +631,7 @@ typedef struct {
     uint8_t     reqType;
     uint8_t     ReqType;                /**< Always ::X_XIUngrabDevice */
     uint16_t    length;                 /**< Length in 4 byte units */
-    Time        time;
+    XXTime        time;
     uint16_t    deviceid;
     uint16_t    pad;
 } xXIUngrabDeviceReq;
@@ -645,7 +645,7 @@ typedef struct {
     uint8_t     reqType;
     uint8_t     ReqType;                /**< Always ::X_XIAllowEvents */
     uint16_t    length;                 /**< Length in 4 byte units */
-    Time        time;
+    XXTime        time;
     uint16_t    deviceid;
     uint8_t     mode;
     uint8_t     pad;
@@ -660,7 +660,7 @@ typedef struct {
     uint8_t     reqType;
     uint8_t     ReqType;                /**< Always ::X_XIAllowEvents */
     uint16_t    length;                 /**< Length in 4 byte units */
-    Time        time;
+    XXTime        time;
     uint16_t    deviceid;
     uint8_t     mode;
     uint8_t     pad;
@@ -677,7 +677,7 @@ typedef struct {
     uint8_t     reqType;
     uint8_t     ReqType;                /**< Always ::X_XIPassiveGrabDevice */
     uint16_t    length;                 /**< Length in 4 byte units */
-    Time        time;
+    XXTime        time;
     Window      grab_window;
     Cursor      cursor;
     uint32_t    detail;
@@ -850,7 +850,7 @@ typedef struct
     uint32_t    length;
     uint16_t    evtype;
     uint16_t    deviceid;
-    Time        time;
+    XXTime        time;
 } xXIGenericDeviceEvent;
 
 /**
@@ -885,7 +885,7 @@ typedef struct
     uint32_t    length;                 /**< Length in 4 byte units */
     uint16_t    evtype;                 /**< ::XI_Hierarchy */
     uint16_t    deviceid;
-    Time        time;
+    XXTime        time;
     uint32_t    flags;                  /**< ::XIMasterAdded, ::XIMasterDeleted,
                                              ::XISlaveAttached, ::XISlaveDetached,
                                              ::XISlaveAdded, ::XISlaveRemoved,
@@ -907,7 +907,7 @@ typedef struct
     uint32_t    length;                 /**< Length in 4 byte units */
     uint16_t    evtype;                 /**< XI_DeviceChanged */
     uint16_t    deviceid;               /**< Device that has changed */
-    Time        time;
+    XXTime        time;
     uint16_t    num_classes;            /**< Number of classes that have changed */
     uint16_t    sourceid;               /**< Source of the new classes */
     uint8_t     reason;                 /**< ::XISlaveSwitch, ::XIDeviceChange */
@@ -928,7 +928,7 @@ typedef struct
     uint32_t    length;             /**< Length in 4 byte units */
     uint16_t    evtype;             /**< XI_TouchOwnership */
     uint16_t    deviceid;           /**< Device that has changed */
-    Time        time;
+    XXTime        time;
     uint32_t    touchid;
     Window      root;
     Window      event;
@@ -952,7 +952,7 @@ typedef struct
     uint32_t    length;                 /**< Length in 4 byte uints */
     uint16_t    evtype;
     uint16_t    deviceid;
-    Time        time;
+    XXTime        time;
     uint32_t    detail;                 /**< Keycode or button */
     Window      root;
     Window      event;
@@ -985,7 +985,7 @@ typedef struct
     uint32_t    length;                 /**< Length in 4 byte uints */
     uint16_t    evtype;                 /**< ::XI_RawEvent */
     uint16_t    deviceid;
-    Time        time;
+    XXTime        time;
     uint32_t    detail;
     uint16_t    sourceid;               /**< The source device (XI 2.1) */
     uint16_t    valuators_len;          /**< Length of trailing valuator
@@ -1006,7 +1006,7 @@ typedef struct
     uint32_t    length;                 /**< Length in 4 byte uints */
     uint16_t    evtype;                 /**< ::XI_Enter */
     uint16_t    deviceid;
-    Time        time;
+    XXTime        time;
     uint16_t    sourceid;
     uint8_t     mode;
     uint8_t     detail;
@@ -1042,7 +1042,7 @@ typedef struct
     uint32_t    length;                 /**< Length in 4 byte units */
     uint16_t    evtype;                 /**< ::XI_PropertyEvent */
     uint16_t    deviceid;
-    Time        time;
+    XXTime        time;
     Atom        property;
     uint8_t     what;                   /**< ::XIPropertyDeleted,
                                              ::XIPropertyCreated,
@@ -1061,7 +1061,7 @@ typedef struct
     uint32_t    length;                 /**< Length in 4 byte units */
     uint16_t    evtype;                 /**< ::XI_BarrierHit or ::XI_BarrierLeave */
     uint16_t    deviceid;
-    Time        time;
+    XXTime        time;
     uint32_t    eventid;
     Window      root;
     Window      event;
@@ -1083,7 +1083,7 @@ typedef xXIBarrierEvent xXIBarrierPointerReleasedEvent;
 typedef xXIBarrierEvent xXIBarrierLeaveEvent;
 
 #undef Window
-#undef Time
+#undef XXTime
 #undef Atom
 #undef Cursor
 #undef Barrier

Source/ThirdParty/X11/extensions/XIproto.h

@@ -52,7 +52,7 @@ SOFTWARE.
 
 /* make sure types have right sizes for protocol structures. */
 #define Window CARD32
-#define Time CARD32
+#define XXTime CARD32
 #define KeyCode CARD8
 #define Mask CARD32
 #define Atom CARD32
@@ -468,8 +468,8 @@ typedef struct {
     CARD8	reqType;	/* input extension major code	*/
     CARD8	ReqType;        /* always X_GetDeviceMotionEvents*/
     CARD16	length B16;
-    Time	start B32;
-    Time	stop B32;
+    XXTime	start B32;
+    TXXTimeime	stop B32;
     CARD8	deviceid;
     BYTE	pad1, pad2, pad3;
 } xGetDeviceMotionEventsReq;
@@ -558,7 +558,7 @@ typedef struct {
     CARD8	ReqType;        /* always X_GrabDevice */
     CARD16	length B16;
     Window	grabWindow B32;
-    Time	time B32;
+    XXTime	time B32;
     CARD16	event_count B16;
     CARD8	this_device_mode;
     CARD8	other_devices_mode;
@@ -591,7 +591,7 @@ typedef struct {
     CARD8	reqType;	/* input extension major code	*/
     CARD8	ReqType;        /* always X_UnGrabDevice	*/
     CARD16	length B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceid;
     BYTE	pad1, pad2, pad3;
 } xUngrabDeviceReq;
@@ -686,7 +686,7 @@ typedef struct {
     CARD8	reqType;	/* input extension major code	*/
     CARD8	ReqType;        /* always X_AllowDeviceEvents	*/
     CARD16	length B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	mode;
     CARD8	deviceid;
     BYTE	pad1, pad2;
@@ -712,7 +712,7 @@ typedef struct {
     CARD16	sequenceNumber B16;
     CARD32	length B32;
     CARD32	focus B32;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	revertTo;
     BYTE	pad1, pad2, pad3;
     CARD32	pad01 B32;
@@ -731,7 +731,7 @@ typedef struct {
     CARD8	ReqType;        /* always X_SetDeviceFocus	*/
     CARD16	length B16;
     Window	focus B32;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	revertTo;
     CARD8	device;
     CARD16	pad01 B16;
@@ -1567,7 +1567,7 @@ typedef struct
     BYTE	type;
     BYTE        detail;
     CARD16	sequenceNumber B16;
-    Time        time B32;
+    XXTime        time B32;
     Window      root B32;
     Window      event B32;
     Window      child B32;
@@ -1591,7 +1591,7 @@ typedef struct
     BYTE	type;
     BYTE        detail;
     CARD16	sequenceNumber B16;
-    Time        time B32;
+    XXTime        time B32;
     Window      window B32;
     BYTE	mode;
     CARD8       deviceid;
@@ -1617,7 +1617,7 @@ typedef struct
     BYTE	type;
     BYTE        deviceid;
     CARD16	sequenceNumber B16;
-    Time        time B32;
+    XXTime        time B32;
     CARD8	num_keys;
     CARD8	num_buttons;
     CARD8	num_valuators;
@@ -1673,7 +1673,7 @@ typedef struct
     KeyCode     firstKeyCode;
     CARD8       count;
     BYTE        pad1;
-    Time        time B32;
+    XXTime        time B32;
     CARD32	pad00 B32;
     CARD32	pad01 B32;
     CARD32	pad02 B32;
@@ -1692,7 +1692,7 @@ typedef struct
     BYTE	type;
     BYTE        deviceid;
     CARD16	sequenceNumber B16;
-    Time        time B32;
+    XXTime        time B32;
     CARD8       request;
     BYTE        pad1, pad2, pad3;
     CARD32	pad00 B32;
@@ -1713,7 +1713,7 @@ typedef struct
     BYTE	type;
     BYTE        pad00;
     CARD16	sequenceNumber B16;
-    Time        time B32;
+    XXTime        time B32;
     BYTE        devchange; /* Device{Added|Removed|Enabled|Disabled|ControlChanged} */
     BYTE        deviceid;
     CARD16      control B16;
@@ -1749,7 +1749,7 @@ typedef struct
     } devicePropertyNotify;
 
 #undef Window
-#undef Time
+#undef XXTime
 #undef KeyCode
 #undef Mask
 #undef Atom

Source/ThirdParty/X11/extensions/XKBproto.h

@@ -27,12 +27,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _XKBPROTO_H_
 #define	_XKBPROTO_H_
 
+#include "Xvproto.h"
+
 #include <X11/Xmd.h>
 #include <X11/extensions/XKB.h>
 
 #define Window CARD32
 #define Atom CARD32
-#define Time CARD32
+#define XXTime CARD32
 #define KeyCode CARD8
 #define KeySym CARD32
 
@@ -1012,7 +1014,7 @@ typedef struct _xkbAnyEvent {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     CARD8	pad1;
     CARD16	pad2 B16;
@@ -1028,7 +1030,7 @@ typedef	struct _xkbNewKeyboardNotify {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     CARD8	oldDeviceID;
     KeyCode	minKeyCode;
@@ -1050,7 +1052,7 @@ typedef	struct _xkbMapNotify {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     CARD8	ptrBtnActions;
     CARD16	changed B16;
@@ -1079,7 +1081,7 @@ typedef	struct _xkbStateNotify {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     CARD8	mods;
     CARD8	baseMods;
@@ -1107,7 +1109,7 @@ typedef struct _xkbControlsNotify {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     CARD8	numGroups;
     CARD16	pad1 B16;
@@ -1126,7 +1128,7 @@ typedef struct _xkbIndicatorNotify {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     CARD8	pad1;
     CARD16	pad2 B16;
@@ -1142,7 +1144,7 @@ typedef struct _xkbNamesNotify {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     CARD8	pad1;
     CARD16	changed B16;
@@ -1166,7 +1168,7 @@ typedef struct _xkbCompatMapNotify {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     CARD8	changedGroups;
     CARD16	firstSI B16;
@@ -1183,7 +1185,7 @@ typedef struct _xkbBellNotify {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     CARD8	bellClass;
     CARD8	bellID;
@@ -1203,7 +1205,7 @@ typedef struct _xkbActionMessage {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     KeyCode	keycode;
     BOOL	press;
@@ -1221,7 +1223,7 @@ typedef struct _xkbAccessXNotify {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     KeyCode	keycode;
     CARD16	detail B16;
@@ -1238,7 +1240,7 @@ typedef struct _xkbExtensionDeviceNotify {
     BYTE	type;
     BYTE	xkbType;
     CARD16	sequenceNumber B16;
-    Time	time B32;
+    XXTime	time B32;
     CARD8	deviceID;
     CARD8	pad1;
     CARD16	reason B16;
@@ -1274,7 +1276,7 @@ typedef struct _xkbEvent {
 
 #undef Window
 #undef Atom
-#undef Time
+#undef XXTime
 #undef KeyCode
 #undef KeySym
 

Source/ThirdParty/X11/extensions/Xvproto.h

@@ -59,7 +59,7 @@ SOFTWARE.
 #define VisualID CARD32
 #define Drawable CARD32
 #define GContext CARD32
-#define Time CARD32
+#define XXTime CARD32
 #define Atom CARD32
 
 /* Structures */
@@ -268,7 +268,7 @@ typedef struct {
   CARD8 xvReqType;
   CARD16 length B16;
   XvPortID port B32;
-  Time time B32;
+  XXTime time B32;
 } xvGrabPortReq;
 #define sz_xvGrabPortReq 12
 
@@ -277,7 +277,7 @@ typedef struct {
   CARD8 xvReqType;
   CARD16 length B16;
   XvPortID port B32;
-  Time time B32;
+  XXTime time B32;
 } xvUngrabPortReq;
 #define sz_xvUngrabPortReq 12
 
@@ -567,7 +567,7 @@ typedef struct {
       BYTE type;
       BYTE reason;
       CARD16 sequenceNumber B16;
-      Time time B32;
+      XXTime time B32;
       Drawable drawable B32;
       XvPortID port B32;
       CARD32 padl5 B32;
@@ -579,7 +579,7 @@ typedef struct {
       BYTE type;
       BYTE padb1;
       CARD16 sequenceNumber B16;
-      Time time B32;
+      XXTime time B32;
       XvPortID port B32;
       Atom attribute B32;
       INT32 value B32;
@@ -596,7 +596,7 @@ typedef struct {
 #undef VisualID
 #undef Drawable
 #undef GContext
-#undef Time
+#undef XXTime
 #undef Atom
 
 #endif /* XVPROTO_H */

Source/ThirdParty/X11/extensions/applewmproto.h

@@ -67,7 +67,7 @@ restoring the definitions in X.h.  */
 #define GContext CARD32
 #define Atom CARD32
 #define VisualID CARD32
-#define Time CARD32
+#define XXTime CARD32
 #define KeyCode CARD8
 #define KeySym CARD32
 
@@ -121,7 +121,7 @@ typedef struct _AppleWMNotify {
 	BYTE	type;		/* always eventBase + event type */
 	BYTE	kind;
 	CARD16	sequenceNumber B16;
-	Time	time B32;	/* time of change */
+	XXTime	time B32;	/* time of change */
 	CARD16	pad1 B16;
 	CARD32	arg B32;
 	CARD32	pad3 B32;
@@ -286,7 +286,7 @@ typedef struct _AppleWMFrameDraw {
 #undef GContext
 #undef Atom
 #undef VisualID
-#undef Time
+#undef XXTime
 #undef KeyCode
 #undef KeySym
 

Source/ThirdParty/X11/extensions/damageproto.h

@@ -37,7 +37,7 @@
 #define GContext CARD32
 #define Atom CARD32
 #define VisualID CARD32
-#define Time CARD32
+#define XXTime CARD32
 #define KeyCode CARD8
 #define KeySym CARD32
 #define Picture CARD32
@@ -134,7 +134,7 @@ typedef struct {
     CARD16	sequenceNumber B16;
     Drawable	drawable B32;
     Damage	damage B32;
-    Time	timestamp B32;
+    XXTime	timestamp B32;
     xRectangle	area;
     xRectangle	geometry;
 } xDamageNotifyEvent;
@@ -151,7 +151,7 @@ typedef struct {
 #undef GContext
 #undef Atom
 #undef VisualID
-#undef Time
+#undef XXTime
 #undef KeyCode
 #undef KeySym
 

Source/ThirdParty/X11/extensions/randrproto.h

@@ -42,7 +42,7 @@
 #define Colormap CARD32
 #define GContext CARD32
 #define Atom CARD32
-#define Time CARD32
+#define XXTime CARD32
 #define KeyCode CARD8
 #define KeySym CARD32
 #define RROutput CARD32
@@ -116,8 +116,8 @@ typedef struct {
     CARD16  sequenceNumber B16;
     CARD32  length B32;
     Window  root B32;
-    Time    timestamp B32;
-    Time    configTimestamp B32;
+    XXTime    timestamp B32;
+    XXTime    configTimestamp B32;
     CARD16  nSizes B16;
     SizeID  sizeID B16;
     Rotation  rotation B16;
@@ -132,8 +132,8 @@ typedef struct {
     CARD8    randrReqType;
     CARD16   length B16;
     Drawable drawable B32;
-    Time     timestamp B32;
-    Time     configTimestamp B32;
+    XXTime     timestamp B32;
+    XXTime     configTimestamp B32;
     SizeID   sizeID B16;
     Rotation rotation B16;
 } xRR1_0SetScreenConfigReq;
@@ -144,8 +144,8 @@ typedef struct {
     CARD8    randrReqType;
     CARD16   length B16;
     Drawable drawable B32;
-    Time     timestamp B32;
-    Time     configTimestamp B32;
+    XXTime     timestamp B32;
+    XXTime     configTimestamp B32;
     SizeID   sizeID B16;
     Rotation rotation B16;
     CARD16   rate B16;
@@ -158,8 +158,8 @@ typedef struct {
     CARD8   status;
     CARD16  sequenceNumber B16;
     CARD32  length B32;
-    Time    newTimestamp B32;  
-    Time    newConfigTimestamp B32;
+    XXTime    newTimestamp B32;
+    XXTime    newConfigTimestamp B32;
     Window  root;
     CARD16  subpixelOrder B16;
     CARD16  pad4 B16;
@@ -248,8 +248,8 @@ typedef struct {
     CARD8	pad;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
-    Time	timestamp B32;
-    Time	configTimestamp B32;
+    XXTime	timestamp B32;
+    XXTime	configTimestamp B32;
     CARD16	nCrtcs B16;
     CARD16	nOutputs B16;
     CARD16	nModes B16;
@@ -264,7 +264,7 @@ typedef struct {
     CARD8	randrReqType;
     CARD16	length B16;
     RROutput	output B32;
-    Time	configTimestamp B32;
+    XXTime	configTimestamp B32;
 } xRRGetOutputInfoReq;
 #define sz_xRRGetOutputInfoReq		12
 
@@ -273,7 +273,7 @@ typedef struct {
     CARD8	status;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
-    Time	timestamp B32;
+    XXTime	timestamp B32;
     RRCrtc	crtc B32;
     CARD32	mmWidth B32;
     CARD32	mmHeight B32;
@@ -458,7 +458,7 @@ typedef struct {
     CARD8	randrReqType;
     CARD16	length B16;
     RRCrtc	crtc B32;
-    Time	configTimestamp B32;
+    XXTime	configTimestamp B32;
 } xRRGetCrtcInfoReq; 
 #define sz_xRRGetCrtcInfoReq		12
 
@@ -467,7 +467,7 @@ typedef struct {
     CARD8	status;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
-    Time	timestamp B32;
+    XXTime	timestamp B32;
     INT16	x B16;
     INT16	y B16;
     CARD16	width B16;
@@ -485,8 +485,8 @@ typedef struct {
     CARD8	randrReqType;
     CARD16	length B16;
     RRCrtc	crtc B32;
-    Time	timestamp B32;
-    Time    	configTimestamp B32;
+    XXTime	timestamp B32;
+    XXTime    	configTimestamp B32;
     INT16	x B16;
     INT16	y B16;
     RRMode	mode B32;
@@ -500,7 +500,7 @@ typedef struct {
     CARD8	status;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
-    Time	newTimestamp B32;
+    XXTime	newTimestamp B32;
     CARD32	pad1 B32;
     CARD32	pad2 B16;
     CARD32	pad3 B32;
@@ -679,7 +679,7 @@ typedef struct {
     CARD8	randrReqType;
     CARD16	length B16;
     RRProvider	provider B32;
-    Time	configTimestamp B32;
+    XXTime	configTimestamp B32;
 } xRRGetProviderInfoReq;
 #define sz_xRRGetProviderInfoReq 12
 
@@ -688,7 +688,7 @@ typedef struct {
     CARD8	status;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
-    Time	timestamp B32;
+    XXTime	timestamp B32;
     CARD32	capabilities B32;
     CARD16	nCrtcs B16;
     CARD16	nOutputs B16;
@@ -705,7 +705,7 @@ typedef struct {
     CARD16	length B16;
     RRProvider  provider B32;
     RRProvider  source_provider B32;
-    Time	configTimestamp B32;
+    XXTime	configTimestamp B32;
 } xRRSetProviderOutputSourceReq;
 #define sz_xRRSetProviderOutputSourceReq 16
 
@@ -715,7 +715,7 @@ typedef struct {
     CARD16	length B16;
     RRProvider  provider B32;
     RRProvider  sink_provider B32;
-    Time	configTimestamp B32;
+    XXTime	configTimestamp B32;
 } xRRSetProviderOffloadSinkReq;
 #define sz_xRRSetProviderOffloadSinkReq 16
 
@@ -883,8 +883,8 @@ typedef struct {
     CARD8 type;				/* always evBase + ScreenChangeNotify */
     CARD8 rotation;			/* new rotation */
     CARD16 sequenceNumber B16;
-    Time timestamp B32;			/* time screen was changed */
-    Time configTimestamp B32;		/* time config data was changed */
+    XXTime timestamp B32;			/* time screen was changed */
+    XXTime configTimestamp B32;		/* time config data was changed */
     Window root B32;			/* root window */
     Window window B32;			/* window requesting notification */
     SizeID sizeID B16;			/* new size ID */
@@ -900,7 +900,7 @@ typedef struct {
     CARD8 type;				/* always evBase + RRNotify */
     CARD8 subCode;			/* RRNotify_CrtcChange */
     CARD16 sequenceNumber B16;
-    Time timestamp B32;			/* time crtc was changed */
+    XXTime timestamp B32;			/* time crtc was changed */
     Window window B32;			/* window requesting notification */
     RRCrtc crtc B32;			/* affected CRTC */
     RRMode mode B32;			/* current mode */
@@ -917,8 +917,8 @@ typedef struct {
     CARD8 type;				/* always evBase + RRNotify */
     CARD8 subCode;			/* RRNotify_OutputChange */
     CARD16 sequenceNumber B16;
-    Time timestamp B32;			/* time output was changed */
-    Time configTimestamp B32;		/* time config was changed */
+    XXTime timestamp B32;			/* time output was changed */
+    XXTime configTimestamp B32;		/* time config was changed */
     Window window B32;			/* window requesting notification */
     RROutput output B32;		/* affected output */
     RRCrtc crtc B32;			/* current crtc */
@@ -936,7 +936,7 @@ typedef struct {
     Window window B32;			/* window requesting notification */
     RROutput output B32;		/* affected output */
     Atom atom B32;			/* property name */
-    Time timestamp B32;			/* time crtc was changed */
+    XXTime timestamp B32;			/* time crtc was changed */
     CARD8 state;			/* NewValue or Deleted */
     CARD8 pad1;
     CARD16 pad2 B16;
@@ -949,7 +949,7 @@ typedef struct {
     CARD8 type;				/* always evBase + RRNotify */
     CARD8 subCode;			/* RRNotify_ProviderChange */
     CARD16 sequenceNumber B16;
-    Time timestamp B32;			/* time provider was changed */
+    XXTime timestamp B32;			/* time provider was changed */
     Window window B32;			/* window requesting notification */
     RRProvider provider B32;		/* affected provider */
     CARD32 pad1 B32;
@@ -966,7 +966,7 @@ typedef struct {
     Window window B32;			/* window requesting notification */
     RRProvider provider B32;		/* affected provider */
     Atom atom B32;			/* property name */
-    Time timestamp B32;			/* time provider was changed */
+    XXTime timestamp B32;			/* time provider was changed */
     CARD8 state;			/* NewValue or Deleted */
     CARD8 pad1;
     CARD16 pad2 B16;
@@ -979,7 +979,7 @@ typedef struct {
     CARD8 type;				/* always evBase + RRNotify */
     CARD8 subCode;			/* RRNotify_ResourceChange */
     CARD16 sequenceNumber B16;
-    Time timestamp B32;			/* time resource was changed */
+    XXTime timestamp B32;			/* time resource was changed */
     Window window B32;			/* window requesting notification */
     CARD32 pad1 B32;
     CARD32 pad2 B32;
@@ -993,7 +993,7 @@ typedef struct {
     CARD8 type;				/* always evBase + RRNotify */
     CARD8 subCode;			/* RRNotify_Lease */
     CARD16 sequenceNumber B16;
-    Time timestamp B32;			/* time resource was changed */
+    XXTime timestamp B32;			/* time resource was changed */
     Window window B32;			/* window requesting notification */
     RRLease lease B32;
     CARD8 created;			/* created/deleted */
@@ -1018,7 +1018,7 @@ typedef struct {
     CARD8	status;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
-    Time	timestamp B32;
+    XXTime	timestamp B32;
     CARD16	left B16;
     CARD16	top B16;
     CARD16	width B16;
@@ -1039,7 +1039,7 @@ typedef struct {
     CARD8	randrReqType;
     CARD16	length B16;
     RRCrtc	crtc B32;
-    Time	timestamp B32;
+    XXTime	timestamp B32;
     CARD16	left B16;
     CARD16	top B16;
     CARD16	width B16;
@@ -1060,7 +1060,7 @@ typedef struct {
     CARD8	status;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
-    Time	newTimestamp B32;
+    XXTime	newTimestamp B32;
     CARD32      pad1 B32;
     CARD32      pad2 B32;
     CARD32      pad3 B32;
@@ -1099,7 +1099,7 @@ typedef struct {
     CARD8	status;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
-    Time	timestamp B32;
+    XXTime	timestamp B32;
     CARD32	nmonitors B32;
     CARD32	noutputs B32;
     CARD32      pad1 B32;
@@ -1141,7 +1141,7 @@ typedef struct {
 #undef Colormap
 #undef GContext
 #undef Atom
-#undef Time
+#undef XXTime
 #undef KeyCode
 #undef KeySym
 #undef Rotation

Source/ThirdParty/X11/extensions/renderproto.h

@@ -36,7 +36,7 @@
 #define GContext CARD32
 #define Atom CARD32
 #define VisualID CARD32
-#define Time CARD32
+#define XXTime CARD32
 #define KeyCode CARD8
 #define KeySym CARD32
 
@@ -649,7 +649,7 @@ typedef struct {
 #undef GContext
 #undef Atom
 #undef VisualID
-#undef Time
+#undef XXTime
 #undef KeyCode
 #undef KeySym
 

Source/ThirdParty/X11/extensions/saverproto.h

@@ -39,7 +39,7 @@ in this Software without prior written authorization from the X Consortium.
 #define GContext CARD32
 #define Atom CARD32
 #define VisualID CARD32
-#define Time CARD32
+#define XXTime CARD32
 #define KeyCode CARD8
 #define KeySym CARD32
 
@@ -147,7 +147,7 @@ typedef struct _ScreenSaverNotify {
     CARD8 type;			/* always eventBase + ScreenSaverNotify */
     BYTE state;			/* off, on, cycle */
     CARD16 sequenceNumber B16;
-    Time timestamp B32;
+    XXTime timestamp B32;
     Window root B32;
     Window window B32;		/* screen saver window */
     BYTE kind;			/* blanked, internal, external */
@@ -168,7 +168,7 @@ typedef struct _ScreenSaverNotify {
 #undef GContext
 #undef Atom
 #undef VisualID
-#undef Time
+#undef XXTime
 #undef KeyCode
 #undef KeySym
 

Source/ThirdParty/X11/extensions/shapeproto.h

@@ -35,7 +35,7 @@ in this Software without prior written authorization from The Open Group.
  */
 
 #define Window CARD32
-#define Time CARD32
+#define XXTime CARD32
 
 #define X_ShapeQueryVersion		0
 #define X_ShapeRectangles		1
@@ -175,7 +175,7 @@ typedef struct _ShapeNotify {
 	INT16	y B16;		/* extents of new shape */
 	CARD16	width B16;
 	CARD16	height B16;
-	Time	time B32;	/* time of change */
+    XXTime	time B32;	/* time of change */
 	BYTE	shaped;		/* set when a shape actual exists */
 	BYTE	pad0;
 	CARD16	pad1 B16;
@@ -232,6 +232,6 @@ typedef struct {
 #define sz_xShapeGetRectanglesReply 32
 
 #undef Window
-#undef Time
+#undef XXTime
 
 #endif /* _SHAPEPROTO_H_ */

Source/ThirdParty/X11/extensions/xfixesproto.h

@@ -59,7 +59,7 @@
 #define GContext CARD32
 #define Atom CARD32
 #define VisualID CARD32
-#define Time CARD32
+#define XXTime CARD32
 #define KeyCode CARD8
 #define KeySym CARD32
 #define Picture CARD32
@@ -131,8 +131,8 @@ typedef struct {
     Window  window B32;
     Window  owner B32;
     Atom    selection B32;
-    Time    timestamp B32;
-    Time    selectionTimestamp B32;
+    XXTime    timestamp B32;
+    XXTime    selectionTimestamp B32;
     CARD32  pad2 B32;
     CARD32  pad3 B32;
 } xXFixesSelectionNotifyEvent;
@@ -153,7 +153,7 @@ typedef struct {
     CARD16  sequenceNumber B16;
     Window  window B32;
     CARD32  cursorSerial B32;
-    Time    timestamp;
+    XXTime    timestamp;
     Atom    name B32;	    /* Version 2 */
     CARD32  pad1 B32;
     CARD32  pad2 B32;
@@ -544,7 +544,7 @@ typedef struct {
 #undef GContext
 #undef Atom
 #undef VisualID
-#undef Time
+#undef XXTime
 #undef KeyCode
 #undef KeySym
 

Source/ThirdParty/X11/extensions/xtestproto.h

@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/extensions/xtestconst.h>
 
 #define Window CARD32
-#define Time CARD32
+#define XXTime CARD32
 #define Cursor CARD32
 
 #define X_XTestGetVersion	0
@@ -94,7 +94,7 @@ typedef struct {
     BYTE	type;
     BYTE	detail;
     CARD16	pad0 B16;
-    Time	time B32;
+    XXTime	time B32;
     Window	root B32;
     CARD32	pad1 B32;
     CARD32	pad2 B32;
@@ -118,7 +118,7 @@ typedef struct {
 #define sz_xXTestGrabControlReq 8
 
 #undef Window
-#undef Time
+#undef XXTime
 #undef Cursor
 
 #endif /* _XTESTPROTO_H_ */