summaryrefslogtreecommitdiff
path: root/src/i810_accel.c
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2009-10-28 12:37:38 +0100
committerOwain G. Ainsworth <oga@openbsd.org>2010-03-01 15:13:01 +0000
commitc2d312720105d44297a6ebe26123be0eb3571645 (patch)
tree12dd7d131c7574c9b7fe06ed3b1bd0e930ccef5f /src/i810_accel.c
parenta8f845423703842ae85cc5c50bf28f1e3b69e668 (diff)
configure: make --disable-dri work even if the server supports DRI
XF86DRI is defined by the SDK so not defining it here just breaks the build. Define HAVE_DRI instead to avoid collisions. Note: DRI2 is still enabled/disabled entirely by SDK defines. Signed-off-by: Rémi Cardona <remi@gentoo.org> Acked-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit a851139c2141f6da370186148f2836e18b2acf83) Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Diffstat (limited to 'src/i810_accel.c')
-rw-r--r--src/i810_accel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i810_accel.c b/src/i810_accel.c
index ae4a6544..94842650 100644
--- a/src/i810_accel.c
+++ b/src/i810_accel.c
@@ -213,7 +213,7 @@ I810WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis)
start);
I810PrintErrorState(pScrn);
ErrorF("space: %d wanted %d\n", ring->space, n);
-#ifdef XF86DRI
+#ifdef HAVE_DRI
if (pI810->directRenderingEnabled) {
DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
DRICloseScreen(screenInfo.screens[pScrn->scrnIndex]);
@@ -245,7 +245,7 @@ I810Sync(ScrnInfoPtr pScrn)
if (I810_DEBUG & (DEBUG_VERBOSE_ACCEL | DEBUG_VERBOSE_SYNC))
ErrorF("I810Sync\n");
-#ifdef XF86DRI
+#ifdef HAVE_DRI
/* VT switching tries to do this.
*/
if (!pI810->LockHeld && pI810->directRenderingEnabled) {