xserver/Xext syncint.h,3.1,3.2

[Chris Lee]

Committed by: clee

Update of /cvs/xserver/xserver/Xext
In directory gabe:/tmp/cvs-serv509

Modified Files:
	syncint.h 
Log Message:
Build fix. (Remove lots of typedefs from here since they're now in the syncstr.h header from XExtensions in xlibs)


Index: syncint.h
===================================================================
RCS file: /cvs/xserver/xserver/Xext/syncint.h,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -d -r3.1 -r3.2
--- syncint.h	2 Nov 2003 19:56:10 -0000	3.1
+++ syncint.h	20 Apr 2005 18:42:31 -0000	3.2
@@ -57,26 +57,10 @@
 
 #define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
 
-typedef struct _SyncCounter {
-    ClientPtr		client;	/* Owning client. 0 for system counters */
-    XSyncCounter	id;		/* resource ID */
-    CARD64		value;		/* counter value */
-    struct _SyncTriggerList *pTriglist;	/* list of triggers */
-    Bool		beingDestroyed; /* in process of going away */
-    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
-} SyncCounter;
-
 /*
  * The System Counter interface
  */
 
-typedef enum {
-    XSyncCounterNeverChanges,
-    XSyncCounterNeverIncreases,
-    XSyncCounterNeverDecreases,
-    XSyncCounterUnrestricted
-} SyncCounterType;
-
 typedef void
 (*SyncQueryValueProcPtr) (pointer pCounter,
 			  CARD64 *freshvalue);
@@ -86,16 +70,6 @@
 			     CARD64 *lessthan,
 			     CARD64 *greaterthan);
 
-typedef struct _SysCounterInfo {
-    char			*name;
-    CARD64			resolution;
-    CARD64			bracket_greater;
-    CARD64			bracket_less;
-    SyncCounterType		counterType;  /* how can this counter change */
-    SyncQueryValueProcPtr	QueryValue;
-    SyncBracketValuesProcPtr	BracketValues;
-} SysCounterInfo;
-
 struct _SyncTrigger;
 
 typedef Bool
@@ -108,55 +82,6 @@
 typedef void
 (*SyncCounterDestroyedProcPtr) (struct _SyncTrigger *pTrigger);
 
-typedef struct _SyncTrigger {
-    SyncCounter			*pCounter;
-    CARD64			wait_value;	/* wait value */
-    unsigned int		value_type;     /* Absolute or Relative */
-    unsigned int		test_type;	/* transition or Comparision type */
-    CARD64			test_value;	/* trigger event threshold value */
-    SyncCheckTriggerProcPtr	CheckTrigger;
-    SyncTriggerFiredProcPtr	TriggerFired;
-    SyncCounterDestroyedProcPtr	CounterDestroyed;
-} SyncTrigger;
-
-typedef struct _SyncTriggerList {
-    SyncTrigger			*pTrigger;
-    struct _SyncTriggerList	*next;
-} SyncTriggerList;
-
-typedef struct _SyncAlarmClientList {
-    ClientPtr			client;
-    XID				delete_id;
-    struct _SyncAlarmClientList *next;
-} SyncAlarmClientList;
-
-typedef struct _SyncAlarm {
-    SyncTrigger			trigger;
-    ClientPtr			client;
-    XSyncAlarm			alarm_id;
-    CARD64			delta;
-    int				events;
-    int				state;
-    SyncAlarmClientList		*pEventClients;
-} SyncAlarm;
-
-typedef struct {
-    ClientPtr	client;
-    CARD32 	delete_id;
-    int		num_waitconditions;
-} SyncAwaitHeader;
-
-typedef struct {
-    SyncTrigger trigger;
-    CARD64	event_threshold;
-    SyncAwaitHeader *pHeader;
-} SyncAwait;
-
-typedef union {
-    SyncAwaitHeader header;
-    SyncAwait	    await;
-} SyncAwaitUnion;
-
 pointer
 SyncCreateSystemCounter(char			    *name,
 			CARD64			    inital_value,