diff options
| author | Keith Packard <keithp@keithp.com> | 2015-09-01 18:51:14 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-07-18 15:27:51 -0400 |
| commit | 9d15912aa475b733bbb20efc367a67dacad63bf1 (patch) | |
| tree | bdbad787bf5be280df99636b37350158da233a8e /Xext | |
| parent | fb0802113b4c57819cba15d64baf79bf4148607e (diff) | |
Remove fd_set from Block/Wakeup handler API
This removes the last uses of fd_set from the server interfaces
outside of the OS layer itself.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/sleepuntil.c | 17 | ||||
| -rw-r--r-- | Xext/sync.c | 12 |
2 files changed, 13 insertions, 16 deletions
diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index 993c028b8..68a7a9bee 100644 --- a/Xext/sleepuntil.c +++ b/Xext/sleepuntil.c @@ -63,14 +63,11 @@ static void ClientAwaken(ClientPtr /* client */ , static int SertafiedDelete(void * /* value */ , XID /* id */ ); -static void SertafiedBlockHandler(void * /* data */ , - OSTimePtr /* wt */ , - void * /* LastSelectMask */ - ); -static void SertafiedWakeupHandler(void * /* data */ , - int /* i */ , - void * /* LastSelectMask */ - ); +static void SertafiedBlockHandler(void *data, + void *timeout); + +static void SertafiedWakeupHandler(void *data, + int i); int ClientSleepUntil(ClientPtr client, @@ -154,7 +151,7 @@ SertafiedDelete(void *value, XID id) } static void -SertafiedBlockHandler(void *data, OSTimePtr wt, void *LastSelectMask) +SertafiedBlockHandler(void *data, void *wt) { SertafiedPtr pReq, pNext; unsigned long delay; @@ -186,7 +183,7 @@ SertafiedBlockHandler(void *data, OSTimePtr wt, void *LastSelectMask) } static void -SertafiedWakeupHandler(void *data, int i, void *LastSelectMask) +SertafiedWakeupHandler(void *data, int i) { SertafiedPtr pReq, pNext; TimeStamp now; diff --git a/Xext/sync.c b/Xext/sync.c index 4c59fea08..323b9dbe1 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -2556,8 +2556,8 @@ static XSyncValue *pnext_time; *** Server Block Handler *** code inspired by multibuffer extension (now deprecated) */ - /*ARGSUSED*/ static void -ServertimeBlockHandler(void *env, struct timeval **wt, void *LastSelectMask) +/*ARGSUSED*/ static void +ServertimeBlockHandler(void *env, void *wt) { XSyncValue delay; unsigned long timeout; @@ -2582,8 +2582,8 @@ ServertimeBlockHandler(void *env, struct timeval **wt, void *LastSelectMask) /* *** Wakeup Handler */ - /*ARGSUSED*/ static void -ServertimeWakeupHandler(void *env, int rc, void *LastSelectMask) +/*ARGSUSED*/ static void +ServertimeWakeupHandler(void *env, int rc) { if (pnext_time) { GetTime(); @@ -2658,7 +2658,7 @@ IdleTimeQueryValue(void *pCounter, CARD64 * pValue_return) } static void -IdleTimeBlockHandler(void *pCounter, struct timeval **wt, void *LastSelectMask) +IdleTimeBlockHandler(void *pCounter, void *wt) { SyncCounter *counter = pCounter; IdleCounterPriv *priv = SysCounterGetPrivate(counter); @@ -2751,7 +2751,7 @@ IdleTimeCheckBrackets(SyncCounter *counter, XSyncValue idle, XSyncValue *less, X } static void -IdleTimeWakeupHandler(void *pCounter, int rc, void *LastSelectMask) +IdleTimeWakeupHandler(void *pCounter, int rc) { SyncCounter *counter = pCounter; IdleCounterPriv *priv = SysCounterGetPrivate(counter); |