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

drm_handle_t, drm_context_t, drm_drawable_t, drm_magic_t.

3 files changed, 3 insertions, 3 deletions

diff --git a/src/mesa/drivers/dri/sis/server/sis_dri.h b/src/mesa/drivers/dri/sis/server/sis_dri.h
index d38e39a053..ce7c9a3114 100644
--- a/src/mesa/drivers/dri/sis/server/sis_dri.h
+++ b/src/mesa/drivers/dri/sis/server/sis_dri.h
@@ -35,7 +35,7 @@ typedef struct {
 #define SIS_DEPTH 2
 
 typedef struct {
-  drmHandle handle;
+  drm_handle_t handle;
   drmSize size;
   drmAddress map;
 } sisRegion, *sisRegionPtr;
diff --git a/src/mesa/drivers/dri/sis/sis_context.h b/src/mesa/drivers/dri/sis/sis_context.h
index 395a7a3e6d..19e7afee7f 100644
--- a/src/mesa/drivers/dri/sis/sis_context.h
+++ b/src/mesa/drivers/dri/sis/sis_context.h
@@ -355,7 +355,7 @@ struct sis_context
 
   unsigned int lastStamp;	        /* mirror driDrawable->lastStamp */
 
-  drmContext hHWContext;
+  drm_context_t hHWContext;
   drm_hw_lock_t *driHwLock;
 
   sisScreenPtr sisScreen;		/* Screen private DRI data */
diff --git a/src/mesa/drivers/dri/sis/sis_screen.h b/src/mesa/drivers/dri/sis/sis_screen.h
index 452278264f..068c0410da 100644
--- a/src/mesa/drivers/dri/sis/sis_screen.h
+++ b/src/mesa/drivers/dri/sis/sis_screen.h
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __SIS_SCREEN_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 */
 } sisRegionRec2, *sisRegionPtr2;