summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xext/sync.c7
-rw-r--r--Xext/syncsrv.h34
2 files changed, 14 insertions, 27 deletions
diff --git a/Xext/sync.c b/Xext/sync.c
index 37c59c2be..3764dbf61 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -926,11 +926,8 @@ SyncCreateSystemCounter(const char *name,
CARD64 initial,
CARD64 resolution,
SyncCounterType counterType,
- void (*QueryValue) (pointer /* pCounter */ ,
- CARD64 * /* pValue_return */ ),
- void (*BracketValues) (pointer /* pCounter */ ,
- CARD64 * /* pbracket_less */ ,
- CARD64 * /* pbracket_greater */ )
+ SyncSystemCounterQueryValue QueryValue,
+ SyncSystemCounterBracketValues BracketValues
)
{
SyncCounter *pCounter;
diff --git a/Xext/syncsrv.h b/Xext/syncsrv.h
index b0464b304..1afaf5fa3 100644
--- a/Xext/syncsrv.h
+++ b/Xext/syncsrv.h
@@ -65,19 +65,22 @@ typedef enum {
XSyncCounterUnrestricted
} SyncCounterType;
+typedef void (*SyncSystemCounterQueryValue)(pointer counter,
+ CARD64 *value_return
+ );
+typedef void (*SyncSystemCounterBracketValues)(pointer counter,
+ CARD64 *pbracket_less,
+ CARD64 *pbracket_greater
+ );
+
typedef struct _SysCounterInfo {
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 */
- );
+ SyncSystemCounterQueryValue QueryValue;
+ SyncSystemCounterBracketValues BracketValues;
} SysCounterInfo;
typedef struct _SyncAlarmClientList {
@@ -118,21 +121,8 @@ extern pointer SyncCreateSystemCounter(const char * /* name */ ,
CARD64 /* resolution */ ,
SyncCounterType
/* change characterization */ ,
- void (* /*QueryValue */ )(
- pointer
- /* pCounter */
- ,
- CARD64 * /* pValue_return */ ), /* XXX prototype */
- void (* /*BracketValues */ )(
- pointer
- /* pCounter */
- ,
- CARD64 *
- /* pbracket_less */
- ,
- CARD64 *
- /* pbracket_greater */
- )
+ SyncSystemCounterQueryValue QueryValue,
+ SyncSystemCounterBracketValues BracketValues
);
extern void SyncChangeCounter(SyncCounter * /* pCounter */ ,