XLibre/xf86-video-nested
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nested.git synced 2026-03-24 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle ABI version 23

Browse Source 
Block and wakeup handlers have changed function signature.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard
2016-07-19 09:06:04 -07:00
parent 4512072ccd
commit 1d02fa6da7
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/driver.c
View File

@@ -85,9 +85,6 @@ static Bool NestedCreateScreenResources(ScreenPtr pScreen);
static void NestedShadowUpdate(ScreenPtr pScreen, shadowBufPtr pBuf);
static Bool NestedCloseScreen(CLOSE_SCREEN_ARGS_DECL);
static void NestedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask);
static void NestedWakeupHandler(pointer data, int i, pointer LastSelectMask);
int NestedValidateModes(ScrnInfoPtr pScrn);
Bool NestedAddMode(ScrnInfoPtr pScrn, int width, int height);
void NestedPrintPscreen(ScrnInfoPtr p);
@@ -534,13 +531,23 @@ NestedMouseTimer(OsTimerPtr timer, CARD32 time, pointer arg) {
}
static void
NestedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask) {
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
NestedBlockHandler(void *data, void *wt)
#else
NestedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask)
#endif
{
NestedClientPrivatePtr pNestedClient = data;
NestedClientCheckEvents(pNestedClient);
}
static void
NestedWakeupHandler(pointer data, int i, pointer LastSelectMask) {
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
NestedWakeupHandler(void *data, int i)
#else
NestedWakeupHandler(pointer data, int i, pointer LastSelectMask)
#endif
{
}
/* Called at each server generation */