MFC: enable build with recent input ABI.

This commit is contained in:
matthieu 2009-09-06 12:22:42 +00:00
parent e17ea6bcfe
commit f090af278c
2 changed files with 6 additions and 6 deletions

View File

@ -248,7 +248,7 @@ GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
}
/* FIXME: we don't have a new video ABI yet */
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
miPointerGetPosition(inputInfo.pointer, &px, &py);
#else
miPointerPosition(&px, &py);
@ -292,7 +292,7 @@ GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
}
/* FIXME: we don't have a new video ABI yet */
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
if (pScreen == miPointerGetScreen(inputInfo.pointer))
#else
if (pScreen == miPointerCurrentScreen())
@ -305,7 +305,7 @@ GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
/* FIXME: we don't have a new video ABI yet */
(*pScreen->SetCursorPosition) (
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
inputInfo.pointer,
#endif
pScreen,

View File

@ -247,7 +247,7 @@ LXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
}
/* FIXME: we don't have a new video ABI yet */
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
miPointerGetPosition(inputInfo.pointer, &px, &py);
#else
miPointerPosition(&px, &py);
@ -291,7 +291,7 @@ LXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
}
/* FIXME: we don't have a new video ABI yet */
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
if (pScreen == miPointerGetScreen(inputInfo.pointer))
#else
if (pScreen == miPointerCurrentScreen())
@ -304,7 +304,7 @@ LXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
(*pScreen->SetCursorPosition) (
/* FIXME: we don't have a new video ABI yet */
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
inputInfo.pointer,
#endif
pScreen,