From 812786f4d4306cb16f8ed57fa4a1a32bb1d13fe3 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 5 Jun 2012 19:55:52 +0100
Subject: [PATCH] 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>
---
 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 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;