diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2017-12-08 15:02:03 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2017-12-08 15:02:03 +0000 |
| commit | e2e6e25be1cbd7ecc45bbd9130c4527f7715e547 (patch) | |
| tree | 85e40fcfbc819cb0394346c69db478a22e9ed122 /xserver/exa/exa.c | |
| parent | 63d0911c1d9f1be4f8755144bced468fcbc398a6 (diff) | |
Update to xserver 1.19.5.
Tested by bru@, jsg@ and others
Diffstat (limited to 'xserver/exa/exa.c')
| -rw-r--r-- | xserver/exa/exa.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/xserver/exa/exa.c b/xserver/exa/exa.c index 51d36f3f3..7266b71f9 100644 --- a/xserver/exa/exa.c +++ b/xserver/exa/exa.c @@ -702,8 +702,7 @@ exaCreateScreenResources(ScreenPtr pScreen) } static void -ExaBlockHandler(ScreenPtr pScreen, void *pTimeout, - void *pReadmask) +ExaBlockHandler(ScreenPtr pScreen, void *pTimeout) { ExaScreenPriv(pScreen); @@ -712,7 +711,7 @@ ExaBlockHandler(ScreenPtr pScreen, void *pTimeout, exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap); unwrap(pExaScr, pScreen, BlockHandler); - (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask); + (*pScreen->BlockHandler) (pScreen, pTimeout); wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler); /* The rest only applies to classic EXA */ @@ -732,13 +731,12 @@ ExaBlockHandler(ScreenPtr pScreen, void *pTimeout, } static void -ExaWakeupHandler(ScreenPtr pScreen, unsigned long result, - void *pReadmask) +ExaWakeupHandler(ScreenPtr pScreen, int result) { ExaScreenPriv(pScreen); unwrap(pExaScr, pScreen, WakeupHandler); - (*pScreen->WakeupHandler) (pScreen, result, pReadmask); + (*pScreen->WakeupHandler) (pScreen, result); wrap(pExaScr, pScreen, WakeupHandler, ExaWakeupHandler); if (result == 0 && pExaScr->numOffscreenAvailable > 1) { |