From aaebfc88c08c79cd70f1e0d1d262a25e9ded47d1 Mon Sep 17 00:00:00 2001 From: Jon Smirl Date: Sun, 4 Jul 2004 20:33:48 +0000 Subject: Patch removes _SOLO definition needed for mesa-solo. mesa-solo uses the NEW_INTERFACE now so _SOLO isn't necessary anymore. Tested with the hardware that I own. --- src/mesa/drivers/dri/common/utils.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/mesa/drivers/dri/common/utils.c') diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index 83d5a8ff326..99dc064826a 100644 --- a/src/mesa/drivers/dri/common/utils.c +++ b/src/mesa/drivers/dri/common/utils.c @@ -32,7 +32,7 @@ #include "extensions.h" #include "utils.h" -#if !defined( DRI_NEW_INTERFACE_ONLY ) && !defined( _SOLO ) +#if !defined( DRI_NEW_INTERFACE_ONLY ) #include "xf86dri.h" /* For XF86DRIQueryVersion prototype. */ #endif @@ -171,7 +171,6 @@ driCheckDriDdxDrmVersions(__DRIscreenPrivate *sPriv, "but got version %d.%d.%d"; int major, minor, patch; -#ifndef _SOLO /* Check the DRI version */ if (XF86DRIQueryVersion(sPriv->display, &major, &minor, &patch)) { if (major != dri_major || minor < dri_minor) { @@ -187,9 +186,6 @@ driCheckDriDdxDrmVersions(__DRIscreenPrivate *sPriv, sPriv->ddxMajor, sPriv->ddxMinor, sPriv->ddxPatch); return GL_FALSE; } -#else - (void)major;(void)minor;(void)patch; -#endif /* Check that the DRM driver version is compatible */ if (sPriv->drmMajor != drm_major || sPriv->drmMinor < drm_minor) { -- cgit v1.2.3