Update to xserver 1.12.2. tested by naddy@, krw@, mpi@.

1 files changed, 52 insertions, 53 deletions

diff --git a/xserver/Xext/syncsrv.h b/xserver/Xext/syncsrv.h
index 7ca1fba26..b0464b304 100644
--- a/xserver/Xext/syncsrv.h
+++ b/xserver/Xext/syncsrv.h
@@ -66,81 +66,80 @@ typedef enum {
 } SyncCounterType;
 
 typedef struct _SysCounterInfo {
-    char	*name;
-    CARD64	resolution;
-    CARD64	bracket_greater;
-    CARD64	bracket_less;
-    SyncCounterType counterType;  /* how can this counter change */
-    void        (*QueryValue)(
-			      pointer /*pCounter*/,
-			      CARD64 * /*freshvalue*/
-);
-    void	(*BracketValues)(
-				 pointer /*pCounter*/,
-				 CARD64 * /*lessthan*/,
-				 CARD64 * /*greaterthan*/
-);
+    const char *name;
+    CARD64 resolution;
+    CARD64 bracket_greater;
+    CARD64 bracket_less;
+    SyncCounterType counterType;        /* how can this counter change */
+    void (*QueryValue) (pointer /*pCounter */ ,
+                        CARD64 *        /*freshvalue */
+        );
+    void (*BracketValues) (pointer /*pCounter */ ,
+                           CARD64 * /*lessthan */ ,
+                           CARD64 *     /*greaterthan */
+        );
 } SysCounterInfo;
 
-
-
 typedef struct _SyncAlarmClientList {
-    ClientPtr	client;
-    XID		delete_id;
+    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;
+    ClientPtr client;
+    XSyncAlarm alarm_id;
+    CARD64 delta;
+    int events;
+    int state;
     SyncAlarmClientList *pEventClients;
 } SyncAlarm;
 
 typedef struct {
-    ClientPtr	client;
-    CARD32 	delete_id;
-    int		num_waitconditions;
+    ClientPtr client;
+    CARD32 delete_id;
+    int num_waitconditions;
 } SyncAwaitHeader;
 
 typedef struct {
     SyncTrigger trigger;
-    CARD64	event_threshold;
+    CARD64 event_threshold;
     SyncAwaitHeader *pHeader;
 } SyncAwait;
 
 typedef union {
     SyncAwaitHeader header;
-    SyncAwait	    await;
+    SyncAwait await;
 } SyncAwaitUnion;
 
-extern pointer SyncCreateSystemCounter(
-    char *	/* name */,
-    CARD64  	/* inital_value */,
-    CARD64  	/* resolution */,
-    SyncCounterType /* change characterization */,
-    void        (* /*QueryValue*/ ) (
-        pointer /* pCounter */,
-        CARD64 * /* pValue_return */), /* XXX prototype */
-    void        (* /*BracketValues*/) (
-        pointer /* pCounter */, 
-        CARD64 * /* pbracket_less */,
-        CARD64 * /* pbracket_greater */)
-);
-
-extern void SyncChangeCounter(
-    SyncCounter *	/* pCounter*/,
-    CARD64  		/* new_value */
-);
-
-extern void SyncDestroySystemCounter(
-    pointer pCounter
-);
-
-extern void InitServertime(void);
+extern pointer SyncCreateSystemCounter(const char * /* name */ ,
+                                       CARD64 /* inital_value */ ,
+                                       CARD64 /* resolution */ ,
+                                       SyncCounterType
+                                       /* change characterization */ ,
+                                       void (* /*QueryValue */ )(
+                                                                    pointer
+                                                                    /* pCounter */
+                                                                    ,
+                                                                    CARD64 * /* pValue_return */ ),     /* XXX prototype */
+                                       void (* /*BracketValues */ )(
+                                                                       pointer
+                                                                       /* pCounter */
+                                                                       ,
+                                                                       CARD64 *
+                                                                       /* pbracket_less */
+                                                                       ,
+                                                                       CARD64 *
+                                                                       /* pbracket_greater */
+                                                                       )
+    );
+
+extern void SyncChangeCounter(SyncCounter * /* pCounter */ ,
+                              CARD64    /* new_value */
+    );
+
+extern void SyncDestroySystemCounter(pointer pCounter);
 
 extern void SyncExtensionInit(void);
-#endif /* _SYNCSRV_H_ */
+#endif                          /* _SYNCSRV_H_ */