diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
| commit | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (patch) | |
| tree | d08c81de02b94da202195d84c99e192bc24ae69e /xorg-server/os/WaitFor.c | |
| parent | aaeb8bf497c82efabc4f9b27c319042c0e72d816 (diff) | |
| download | vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.gz vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.bz2 vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.zip | |
mesa xkeyboard-config xserver git update 15 jan 2014
xserver commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
Diffstat (limited to 'xorg-server/os/WaitFor.c')
| -rw-r--r-- | xorg-server/os/WaitFor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/os/WaitFor.c b/xorg-server/os/WaitFor.c index 39fedd9a2..3eb15b9b8 100644 --- a/xorg-server/os/WaitFor.c +++ b/xorg-server/os/WaitFor.c @@ -118,7 +118,7 @@ struct _OsTimerRec { CARD32 expires; CARD32 delta; OsTimerCallback callback; - pointer arg; + void *arg; }; static void DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev); @@ -212,7 +212,7 @@ WaitForSomething(int *pClientsReady) XFD_COPYSET(&AllSockets, &LastSelectMask); } - BlockHandler((pointer) &wt, (pointer) &LastSelectMask); + BlockHandler((void *) &wt, (void *) &LastSelectMask); if (NewOutputPending) FlushAllOutput(); /* keep this check close to select() call to minimize race */ @@ -226,7 +226,7 @@ WaitForSomething(int *pClientsReady) i = Select(MaxClients, &LastSelectMask, NULL, NULL, wt); } selecterr = GetErrno(); - WakeupHandler(i, (pointer) &LastSelectMask); + WakeupHandler(i, (void *) &LastSelectMask); if (i <= 0) { /* An error or timeout occurred */ if (dispatchException) return 0; @@ -303,7 +303,7 @@ WaitForSomething(int *pClientsReady) XFD_ANDSET(&tmp_set, &LastSelectMask, &WellKnownConnections); if (XFD_ANYSET(&tmp_set)) QueueWorkProc(EstablishNewConnections, NULL, - (pointer) &LastSelectMask); + (void *) &LastSelectMask); if (XFD_ANYSET(&devicesReadable) || XFD_ANYSET(&clientsReadable)) break; @@ -416,7 +416,7 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev) OsTimerPtr TimerSet(OsTimerPtr timer, int flags, CARD32 millis, - OsTimerCallback func, pointer arg) + OsTimerCallback func, void *arg) { register OsTimerPtr *prev; CARD32 now = GetTimeInMillis(); @@ -564,7 +564,7 @@ NextDPMSTimeout(INT32 timeout) #endif /* DPMSExtension */ static CARD32 -ScreenSaverTimeoutExpire(OsTimerPtr timer, CARD32 now, pointer arg) +ScreenSaverTimeoutExpire(OsTimerPtr timer, CARD32 now, void *arg) { INT32 timeout = now - LastEventTime(XIAllDevices).milliseconds; CARD32 nextTimeout = 0; |