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/common/dri_util.c | 10 +++++-----
 src/mesa/drivers/dri/common/dri_util.h |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 4dbd57ae86..6b251c1cd6 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -62,7 +62,7 @@ static const int empty_attribute_list[1] = { None };
 static PFNGLXWINDOWEXISTSPROC window_exists;
 
 typedef Bool (*PFNGLXCREATECONTEXTWITHCONFIGPROC)( __DRInativeDisplay*, int, int, void *,
-    drmContextPtr );
+    drm_context_t * );
 
 static PFNGLXCREATECONTEXTWITHCONFIGPROC create_context_with_config;
 
@@ -167,7 +167,7 @@ findConfigMode(__DRInativeDisplay *dpy, int scrn, VisualID vid,
  */
 static Bool
 fake_XF86DRICreateContextWithConfig( __DRInativeDisplay* dpy, int screen, int configID,
-				     XID* context, drmContextPtr hHWContext )
+				     XID* context, drm_context_t * hHWContext )
 {
     Visual  vis;
     
@@ -1329,7 +1329,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
 {
     int directCapable;
     __DRIscreenPrivate *psp = NULL;
-    drmHandle hSAREA;
+    drm_handle_t hSAREA;
     drmAddress pSAREA;
     char *BusID;
     __GLcontextModes *modes;
@@ -1380,7 +1380,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
 	err_extra = strerror( -fd );
 
 	if (fd >= 0) {
-	    drmMagic magic;
+	    drm_magic_t magic;
 
 	    err_msg = "drmGetMagic";
 	    err_extra = NULL;
@@ -1426,7 +1426,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
 						&dri_version.major,
 						&dri_version.minor,
 						&dri_version.patch)) {
-			    drmHandle  hFB;
+			    drm_handle_t  hFB;
 			    int        junk;
 
 			    /*
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index 1cc5f7cc54..a36e94be83 100644
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -261,7 +261,7 @@ struct __DRIdrawablePrivateRec {
     /**
      * Kernel drawable handle
      */
-    drmDrawable hHWDrawable;
+    drm_drawable_t hHWDrawable;
 
     /**
      * Driver's private drawable information.  
@@ -377,7 +377,7 @@ struct __DRIcontextPrivateRec {
     /**
      * Kernel context handle used to access the device lock.
      */
-    drmContext hHWContext;
+    drm_context_t hHWContext;
 
     /**
      * Device driver's private context data.  This structure is opaque.
-- 
cgit v1.2.3