[PATCH] xwin: fixup block/wakeup handlers

[Dave Airlie]

From: Dave Airlie <airlied at redhat.com>

These got missed out in the api changeover.

Reported-by: Colin Harrison <colin.harrison at virgin.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 hw/xwin/win.h       |    3 +--
 hw/xwin/winblock.c  |    4 ++--
 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 878419d..b84ea9b 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 5faa113..c1a6e70 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 8c9140b..77c1605 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;
 
-- 
1.7.10.2