From eec95d13f408f5489fe8c6b611d080c275c541fb Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Mon, 15 Aug 2005 07:30:05 +0000 Subject: Egbert's 64bit fixes for mixed 32/64bit clients --- src/mga_dri.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/mga_dri.h') diff --git a/src/mga_dri.h b/src/mga_dri.h index 218b8fb..f1afb5d 100644 --- a/src/mga_dri.h +++ b/src/mga_dri.h @@ -81,6 +81,16 @@ typedef struct { * again) on the client-side. At some point when it is safe to do so * (probably for the X.org 6.9 / 7.0 release), these fields should be removed. */ +#if 1 +typedef struct _mgaDrmRegion { + drm_handle_t handle; + unsigned int offset; + drmSize size; +} mgaDrmRegion, *mgaDrmRegionPtr; +#else +#define mgaDrmRegion drmRegion +#endif + typedef struct { int chipset; int width; @@ -115,10 +125,10 @@ typedef struct { * \name DRM memory regions. */ /*@{*/ - drmRegion registers; /**< MMIO registers. */ - drmRegion status; /**< Unused client-side since forever. */ - drmRegion primary; /**< Primary DMA region. */ - drmRegion buffers; /**< Unused client-side since forever. */ + mgaDrmRegion registers; /**< MMIO registers. */ + mgaDrmRegion status; /**< Unused client-side since forever. */ + mgaDrmRegion primary; /**< Primary DMA region. */ + mgaDrmRegion buffers; /**< Unused client-side since forever. */ /*@}*/ unsigned int sarea_priv_offset; -- cgit v1.2.3