diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-06-05 19:55:52 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-05 13:02:38 -0700 |
| commit | 812786f4d4306cb16f8ed57fa4a1a32bb1d13fe3 (patch) | |
| tree | 4f6067f2d931a9bbf59d4bb80af5265ad50c5633 /hw | |
| parent | 3cbaf621782fb5f5679acf9104571d3ae2b48b72 (diff) | |
xwin: fixup block/wakeup handlers
These got missed out in the api changeover.
Reported-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xwin/win.h | 3 | ||||
| -rw-r--r-- | hw/xwin/winblock.c | 4 | ||||
| -rw-r--r-- | hw/xwin/winwakeup.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 878419da3..b84ea9b14 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -780,7 +780,7 @@ void winSetAuthorization(void); void winBlockHandler(ScreenPtr pScreen, - pointer pBlockData, pointer pTimeout, pointer pReadMask); + pointer pTimeout, pointer pReadMask); #ifdef XWIN_NATIVEGDI /* @@ -1123,7 +1123,6 @@ Bool void winWakeupHandler(ScreenPtr pScreen, - pointer pWakeupData, unsigned long ulResult, pointer pReadmask); /* diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c index 5faa1136d..c1a6e705a 100644 --- a/hw/xwin/winblock.c +++ b/hw/xwin/winblock.c @@ -37,10 +37,10 @@ /* See Porting Layer Definition - p. 6 */ void winBlockHandler(ScreenPtr pScreen, - pointer pBlockData, pointer pTimeout, pointer pReadMask) + pointer pTimeout, pointer pReadMask) { #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW) - winScreenPriv((ScreenPtr) pBlockData); + winScreenPriv(pScreen); #endif MSG msg; diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c index 8c9140be6..77c160533 100644 --- a/hw/xwin/winwakeup.c +++ b/hw/xwin/winwakeup.c @@ -39,7 +39,7 @@ /* See Porting Layer Definition - p. 7 */ void winWakeupHandler(ScreenPtr pScreen, - pointer pWakeupData, unsigned long ulResult, pointer pReadmask) + unsigned long ulResult, pointer pReadmask) { MSG msg; |