Replace drmHandle, drmContext, drmDrawable, drmMagic and related types with

drm_handle_t, drm_context_t, drm_drawable_t, drm_magic_t.

3 files changed, 10 insertions, 10 deletions

diff --git a/src/mesa/drivers/dri/mach64/mach64_context.h b/src/mesa/drivers/dri/mach64/mach64_context.h
index 3b22eef7de5..a4a48b8fb38 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.h
+++ b/src/mesa/drivers/dri/mach64/mach64_context.h
@@ -303,7 +303,7 @@ struct mach64_context {
 
    unsigned int lastStamp;		/* mirror driDrawable->lastStamp */
 
-   drmContext hHWContext;
+   drm_context_t hHWContext;
    drm_hw_lock_t *driHwLock;
    int driFd;
 
diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.h b/src/mesa/drivers/dri/mach64/mach64_screen.h
index c78053f03af..298c0e6c833 100644
--- a/src/mesa/drivers/dri/mach64/mach64_screen.h
+++ b/src/mesa/drivers/dri/mach64/mach64_screen.h
@@ -37,7 +37,7 @@
 #include "xmlconfig.h"
 
 typedef struct {
-   drmHandle handle;			/* Handle to the DRM region */
+   drm_handle_t handle;			/* Handle to the DRM region */
    drmSize size;			/* Size of the DRM region */
    drmAddress *map;			/* Mapping of the DRM region */
 } mach64RegionRec, *mach64RegionPtr;
diff --git a/src/mesa/drivers/dri/mach64/server/mach64_dri.h b/src/mesa/drivers/dri/mach64/server/mach64_dri.h
index 01c4dcf2028..139668e3f3e 100644
--- a/src/mesa/drivers/dri/mach64/server/mach64_dri.h
+++ b/src/mesa/drivers/dri/mach64/server/mach64_dri.h
@@ -34,28 +34,28 @@
 #include "xf86drm.h"
 
 typedef struct {
-   drmHandle fbHandle;
+   drm_handle_t fbHandle;
 
-   drmHandle regsHandle;
+   drm_handle_t regsHandle;
    drmSize regsSize;
 
    int IsPCI;
 
-   drmHandle agpHandle;            /* Handle from drmAgpAlloc */
+   drm_handle_t agpHandle;            /* Handle from drmAgpAlloc */
    unsigned long agpOffset;
    drmSize agpSize;
    int agpMode;
 
    /* DMA descriptor ring */
    unsigned long     ringStart;        /* Offset into AGP space */
-   drmHandle         ringHandle;       /* Handle from drmAddMap */
+   drm_handle_t         ringHandle;       /* Handle from drmAddMap */
    drmSize           ringMapSize;      /* Size of map */
    int               ringSize;         /* Size of ring (in kB) */
    drmAddress        ringMap;          /* Map */
 
    /* vertex buffer data */
    unsigned long     bufferStart;      /* Offset into AGP space */
-   drmHandle         bufferHandle;     /* Handle from drmAddMap */
+   drm_handle_t         bufferHandle;     /* Handle from drmAddMap */
    drmSize           bufferMapSize;    /* Size of map */
    int               bufferSize;       /* Size of buffers (in MB) */
    drmAddress        bufferMap;        /* Map */
@@ -65,7 +65,7 @@ typedef struct {
 
    /* AGP Texture data */
    unsigned long     agpTexStart;      /* Offset into AGP space */
-   drmHandle         agpTexHandle;     /* Handle from drmAddMap */
+   drm_handle_t         agpTexHandle;     /* Handle from drmAddMap */
    drmSize           agpTexMapSize;    /* Size of map */
    int               agpTexSize;       /* Size of AGP tex space (in MB) */
    drmAddress        agpTexMap;        /* Map */
@@ -113,10 +113,10 @@ typedef struct {
    unsigned int textureSize;
    int logTextureGranularity;
 
-   drmHandle regs;
+   drm_handle_t regs;
    drmSize regsSize;
 
-   drmHandle agp;
+   drm_handle_t agp;
    drmSize agpSize;
    unsigned int agpTextureOffset;
    unsigned int agpTextureSize;