git pull api break - squashed

[Colin Harrison]

Hi,

Tinderbox for CYGWIN will probably build but crash.

In xserver/hw/xwin...
Need to remove redundant pBlockData from winBlockHandler() function and
pWakeupData from winWakeupHandler() function e.g.

--- ./hw/xwin/save_winblock.c   2012-06-05 17:00:47.831477850 +0100
+++ ./hw/xwin/winblock.c        2012-06-05 17:44:04.512482055 +0100
@@ -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;

Etc.

Thanks,
Colin Harrison