summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2009-09-06 12:22:43 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2009-09-06 12:22:43 +0000
commitdac1489af6a4ac38b1413a232146c769c0d3c9b4 (patch)
treeb067f94ab4faae91b8876f29d77bdc4dda169c44
parentfcdf6ad3218589591bbeb0532ef9642b79274197 (diff)
MFC: enable build with recent input ABI.
-rw-r--r--driver/xf86-video-geode/src/gx_randr.c6
-rw-r--r--driver/xf86-video-geode/src/lx_randr.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/driver/xf86-video-geode/src/gx_randr.c b/driver/xf86-video-geode/src/gx_randr.c
index 553fce2fd..2b5a97ca4 100644
--- a/driver/xf86-video-geode/src/gx_randr.c
+++ b/driver/xf86-video-geode/src/gx_randr.c
@@ -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,
diff --git a/driver/xf86-video-geode/src/lx_randr.c b/driver/xf86-video-geode/src/lx_randr.c
index e22466c47..06047278e 100644
--- a/driver/xf86-video-geode/src/lx_randr.c
+++ b/driver/xf86-video-geode/src/lx_randr.c
@@ -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,