Update to the following packages:

  - glproto-1.4.12
  - kbproto-1.0.5
  - renderproto-0.11.1
  - xclock-1.0.5
  - xextproto-7.1.2
  - xproto-7.0.18
  - xwininfo-1.1.0
  

1 files changed, 1 insertions, 311 deletions

diff --git a/X11/extensions/syncstr.h b/X11/extensions/syncstr.h
index 4e384f22e..87697a22f 100644
--- a/X11/extensions/syncstr.h
+++ b/X11/extensions/syncstr.h
@@ -53,317 +53,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #ifndef _SYNCSTR_H_
 #define _SYNCSTR_H_
 
-#include "sync.h"
-
-#ifndef _SYNC_OS
-
-/* cover up types from sync.h to make sure they're the right size for
- * protocol packaging.  These will be undef'ed after all the protocol
- * structures are defined.
- */
-#define XSyncCounter CARD32
-#define XSyncAlarm   CARD32
-
-/*
- * Initialize
- */
-typedef struct _xSyncInitialize {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    CARD8	majorVersion;
-    CARD8	minorVersion;
-    CARD16	pad B16;
-} xSyncInitializeReq;
-#define sz_xSyncInitializeReq		8
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	majorVersion;
-    CARD8	minorVersion;
-    CARD16	pad B16;
-    CARD32	pad0 B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xSyncInitializeReply;
-#define sz_xSyncInitializeReply	32
-
-/*
- * ListSystemCounters
- */
-typedef struct _xSyncListSystemCounters
-{
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-} xSyncListSystemCountersReq;
-#define sz_xSyncListSystemCountersReq	4
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    INT32	nCounters B32;
-    CARD32	pad0 B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xSyncListSystemCountersReply;
-#define sz_xSyncListSystemCountersReply	32
-
-typedef struct {
-    XSyncCounter counter B32;
-    INT32	resolution_hi B32;
-    CARD32	resolution_lo B32;
-    CARD16	name_length B16;
-} xSyncSystemCounter;
-#define sz_xSyncSystemCounter 14
-
-/*
- * Create Counter
- */
-typedef struct _xSyncCreateCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter cid B32;
-    INT32       initial_value_hi B32;
-    CARD32	initial_value_lo B32;
-} xSyncCreateCounterReq;
-#define sz_xSyncCreateCounterReq	16
-
-/*
- * Change Counter
- */
-typedef struct _xSyncChangeCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter cid B32;
-    INT32       value_hi B32;
-    CARD32	value_lo B32;
-} xSyncChangeCounterReq;
-#define sz_xSyncChangeCounterReq	16
-
-/*
- * Set Counter
- */
-typedef struct _xSyncSetCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter cid B32;
-    INT32       value_hi B32;
-    CARD32	value_lo B32;
-} xSyncSetCounterReq;
-#define sz_xSyncSetCounterReq	16
-
-/*
- * Destroy Counter
- */
-typedef struct _xSyncDestroyCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter counter B32;
-} xSyncDestroyCounterReq;
-#define sz_xSyncDestroyCounterReq	8
-
-/*
- * Query Counter
- */
-typedef struct _xSyncQueryCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter counter B32;
-} xSyncQueryCounterReq;
-#define sz_xSyncQueryCounterReq		8
-
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    INT32	value_hi B32;
-    CARD32	value_lo B32;
-    CARD32	pad0 B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-} xSyncQueryCounterReply;
-#define sz_xSyncQueryCounterReply	32
-
-/*
- * Await
- */
-typedef struct _xSyncAwaitReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-} xSyncAwaitReq;
-#define sz_xSyncAwaitReq		4
-
-typedef struct _xSyncWaitCondition {
-    XSyncCounter counter B32;
-    CARD32	value_type B32;
-    INT32       wait_value_hi B32;
-    CARD32      wait_value_lo B32;
-    CARD32	test_type B32;
-    INT32	event_threshold_hi B32;
-    CARD32	event_threshold_lo B32;
-} xSyncWaitCondition;
-#define sz_xSyncWaitCondition		28
-
-/*
- * Create Alarm
- */
-typedef struct _xSyncCreateAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	id B32;
-    CARD32      valueMask B32;
-} xSyncCreateAlarmReq;
-#define sz_xSyncCreateAlarmReq		12
-
-/*
- * Destroy Alarm
- */
-typedef struct _xSyncDestroyAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	alarm B32;
-} xSyncDestroyAlarmReq;
-#define sz_xSyncDestroyAlarmReq		8
-
-/*
- * Query Alarm
- */
-typedef struct _xSyncQueryAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	alarm B32;
-} xSyncQueryAlarmReq;
-#define sz_xSyncQueryAlarmReq		8
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    XSyncCounter counter B32;
-    CARD32	value_type B32;
-    INT32	wait_value_hi B32;
-    CARD32	wait_value_lo B32;
-    CARD32	test_type      B32;
-    INT32	delta_hi B32;
-    CARD32	delta_lo B32;
-    BOOL        events;
-    BYTE        state;
-    BYTE	pad0;
-    BYTE	pad1;
-} xSyncQueryAlarmReply;
-#define sz_xSyncQueryAlarmReply		40
-
-/*
- * Change Alarm
- */
-typedef struct _xSyncChangeAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	alarm B32;
-    CARD32	valueMask B32;
-} xSyncChangeAlarmReq;
-#define sz_xSyncChangeAlarmReq		12
-
-/*
- * SetPriority
- */
-typedef struct _xSyncSetPriority{
-    CARD8   	reqType;
-    CARD8   	syncReqType;
-    CARD16  	length B16;
-    CARD32  	id B32;
-    INT32  	priority B32;
-} xSyncSetPriorityReq;
-#define sz_xSyncSetPriorityReq	    	12
-
-/*
- * Get Priority
- */
-typedef struct _xSyncGetPriority{
-    CARD8   	reqType;
-    CARD8   	syncReqType;
-    CARD16  	length B16;
-    CARD32  	id B32; /*XXX XID? */
-} xSyncGetPriorityReq;
-#define sz_xSyncGetPriorityReq	    	 8
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    INT32  	priority B32;
-    CARD32  	pad0 B32;
-    CARD32  	pad1 B32;
-    CARD32  	pad2 B32;
-    CARD32  	pad3 B32;
-    CARD32  	pad4 B32;
-} xSyncGetPriorityReply;
-#define sz_xSyncGetPriorityReply	32
-
-/*
- * Events
- */
-
-typedef struct _xSyncCounterNotifyEvent {
-    BYTE	type;
-    BYTE	kind;
-    CARD16	sequenceNumber B16;
-    XSyncCounter counter B32;
-    INT32	wait_value_hi B32;
-    CARD32	wait_value_lo B32;
-    INT32	counter_value_hi B32;
-    CARD32	counter_value_lo B32;
-    CARD32	time B32;
-    CARD16	count B16;
-    BOOL	destroyed;
-    BYTE        pad0;
-} xSyncCounterNotifyEvent;
-
-typedef struct _xSyncAlarmNotifyEvent {
-    BYTE	type;
-    BYTE	kind;
-    CARD16	sequenceNumber B16;
-    XSyncAlarm	alarm B32;
-    INT32	counter_value_hi B32;
-    CARD32	counter_value_lo B32;
-    INT32	alarm_value_hi B32;
-    CARD32	alarm_value_lo B32;
-    CARD32	time B32;
-    CARD8       state;
-    BYTE        pad0;
-    BYTE        pad1;
-    BYTE        pad2;
-} xSyncAlarmNotifyEvent;
-
-#undef XSyncCounter
-#undef XSyncAlarm
-
-#endif /* _SYNC_OS */
+#include <X11/extensions/syncproto.h>
 
 #ifdef _SYNC_SERVER