frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Dave Airlie 2012-06-05 19:55:52 +01:00 committed by Keith Packard
parent 3cbaf62178
commit 812786f4d4
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xwin/win.h
View File

@ -780,7 +780,7 @@ void winSetAuthorization(void);
void void
winBlockHandler(ScreenPtr pScreen, winBlockHandler(ScreenPtr pScreen,
pointer pBlockData, pointer pTimeout, pointer pReadMask); pointer pTimeout, pointer pReadMask);
#ifdef XWIN_NATIVEGDI #ifdef XWIN_NATIVEGDI
/* /*
@ -1123,7 +1123,6 @@ Bool
void void
winWakeupHandler(ScreenPtr pScreen, winWakeupHandler(ScreenPtr pScreen,
pointer pWakeupData,
unsigned long ulResult, pointer pReadmask); unsigned long ulResult, pointer pReadmask);
/* /*

4
hw/xwin/winblock.c
View File

@ -37,10 +37,10 @@
/* See Porting Layer Definition - p. 6 */ /* See Porting Layer Definition - p. 6 */
void void
winBlockHandler(ScreenPtr pScreen, winBlockHandler(ScreenPtr pScreen,
pointer pBlockData, pointer pTimeout, pointer pReadMask) pointer pTimeout, pointer pReadMask)
{ {
#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW) #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
winScreenPriv((ScreenPtr) pBlockData); winScreenPriv(pScreen);
#endif #endif
MSG msg; MSG msg;

2
hw/xwin/winwakeup.c
View File

@ -39,7 +39,7 @@
/* See Porting Layer Definition - p. 7 */ /* See Porting Layer Definition - p. 7 */
void void
winWakeupHandler(ScreenPtr pScreen, winWakeupHandler(ScreenPtr pScreen,
pointer pWakeupData, unsigned long ulResult, pointer pReadmask) unsigned long ulResult, pointer pReadmask)
{ {
MSG msg; MSG msg;