diff options
| author | Eric Anholt <eric@anholt.net> | 2009-11-05 15:40:20 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-11-05 16:02:02 -0800 |
| commit | dbb68168dc909ab2ec1d935322c3fd8581e666f1 (patch) | |
| tree | 37b193b0d41a6529c9c546e5f8672ab63917c018 /src/i810.h | |
| parent | 4c8e783d84d2c14c8a1638b6a12307c0164d3e31 (diff) | |
Revert "configure: make --disable-dri work even if the server supports DRI"
This reverts commit a851139c2141f6da370186148f2836e18b2acf83.
It broke the build, and I don't see why we should be supporting this
anyway.
Conflicts:
configure.ac
src/Makefile.am
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 HAVE_DRI +#ifdef XF86DRI #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 HAVE_DRI not defined. */ + Bool directRenderingEnabled; /* false if XF86DRI not defined. */ -#ifdef HAVE_DRI +#ifdef XF86DRI int LockHeld; DRIInfoPtr pDRIInfo; int drmSubFD; @@ -272,7 +272,7 @@ typedef struct _I810Rec { #define I810_SELECT_BACK 1 #define I810_SELECT_DEPTH 2 -#ifdef HAVE_DRI +#ifdef XF86DRI extern Bool I810DRIScreenInit(ScreenPtr pScreen); extern void I810DRICloseScreen(ScreenPtr pScreen); extern Bool I810DRIFinishScreenInit(ScreenPtr pScreen); |