From c06b25594e5effe34a90c067e1a3da0f61cf2b13 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Wed, 2 Jun 2004 05:07:10 +0000
Subject: Replace drmHandle, drmContext, drmDrawable, drmMagic and related
 types with drm_handle_t, drm_context_t, drm_drawable_t, drm_magic_t.

---
 src/mesa/drivers/dri/tdfx/server/tdfx_dri.c | 2 +-
 src/mesa/drivers/dri/tdfx/server/tdfx_dri.h | 2 +-
 src/mesa/drivers/dri/tdfx/tdfx_context.h    | 2 +-
 src/mesa/drivers/dri/tdfx/tdfx_screen.h     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/drivers/dri/tdfx')

diff --git a/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c b/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c
index e0f7609be7..8184f60361 100644
--- a/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c
+++ b/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c
@@ -259,7 +259,7 @@ static int createScreen (DRIDriverContext *ctx, TDFXDRIPtr pTDFX)
    /* Need to AddMap the framebuffer and mmio regions here:
     */
    if (drmAddMap( ctx->drmFD,
-		  (drmHandle)ctx->FBStart,
+		  (drm_handle_t)ctx->FBStart,
 		  ctx->FBSize,
 		  DRM_FRAME_BUFFER,
 #ifndef _EMBEDDED
diff --git a/src/mesa/drivers/dri/tdfx/server/tdfx_dri.h b/src/mesa/drivers/dri/tdfx/server/tdfx_dri.h
index 956b7e7034..e7ad87d1b1 100644
--- a/src/mesa/drivers/dri/tdfx/server/tdfx_dri.h
+++ b/src/mesa/drivers/dri/tdfx/server/tdfx_dri.h
@@ -6,7 +6,7 @@
 #include "xf86drm.h"
 
 typedef struct {
-  drmHandle regs;
+  drm_handle_t regs;
   drmSize regsSize;
   drmAddress regsMap;
   int deviceID;
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.h b/src/mesa/drivers/dri/tdfx/tdfx_context.h
index 61eab8f2f8..201fce1a01 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.h
@@ -914,7 +914,7 @@ struct tdfx_context {
    __DRIscreenPrivate *driScreen;
    __DRIcontextPrivate *driContext;
    __DRIdrawablePrivate *driDrawable;
-   drmContext hHWContext;
+   drm_context_t hHWContext;
    drm_hw_lock_t *driHwLock;
    int driFd;
    tdfxScreenPrivate *fxScreen;
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_screen.h b/src/mesa/drivers/dri/tdfx/tdfx_screen.h
index 2a79c88b0f..3faeb84e75 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_screen.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_screen.h
@@ -40,7 +40,7 @@
 #ifdef GLX_DIRECT_RENDERING
 
 typedef struct {
-   drmHandle handle;
+   drm_handle_t handle;
    drmSize size;
    drmAddress map;
 } tdfxRegion, *tdfxRegionPtr;
-- 
cgit v1.2.3