diff options
| author | Rémi Cardona <remi@gentoo.org> | 2009-10-28 12:37:38 +0100 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2009-11-05 16:58:34 +0100 |
| commit | a851139c2141f6da370186148f2836e18b2acf83 (patch) | |
| tree | e93d1e6009a4a994df165b6429f60ba92a6c6804 /src/i810.h | |
| parent | 07e0b2cff6107d6c86096c7da4e31b0c976794d5 (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>
Diffstat (limited to 'src/i810.h')
| -rw-r--r-- | src/i810.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -52,7 +52,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "xorg-server.h" #include <pciaccess.h> -#ifdef XF86DRI +#ifdef HAVE_DRI #include "xf86drm.h" #include "sarea.h" #define _XF86DRI_SERVER_ @@ -229,9 +229,9 @@ typedef struct _I810Rec { I810ReadByteFunc readStandard; Bool directRenderingDisabled; /* DRI disabled in PreInit */ - Bool directRenderingEnabled; /* false if XF86DRI not defined. */ + Bool directRenderingEnabled; /* false if HAVE_DRI not defined. */ -#ifdef XF86DRI +#ifdef HAVE_DRI int LockHeld; DRIInfoPtr pDRIInfo; int drmSubFD; @@ -272,7 +272,7 @@ typedef struct _I810Rec { #define I810_SELECT_BACK 1 #define I810_SELECT_DEPTH 2 -#ifdef XF86DRI +#ifdef HAVE_DRI extern Bool I810DRIScreenInit(ScreenPtr pScreen); extern void I810DRICloseScreen(ScreenPtr pScreen); extern Bool I810DRIFinishScreenInit(ScreenPtr pScreen); |