3 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i830/i830_context.h b/src/mesa/drivers/dri/i830/i830_context.h
index bb88c97de35..de141bd4a18 100644
--- a/src/mesa/drivers/dri/i830/i830_context.h
+++ b/src/mesa/drivers/dri/i830/i830_context.h
@@ -209,7 +209,7 @@ struct i830_context_t
    drm_clip_rect_t draw_rect;
    drm_clip_rect_t scissor_rect;
 
-   drmContext hHWContext;
+   drm_context_t hHWContext;
    drmLock *driHwLock;
    int driFd;
 
diff --git a/src/mesa/drivers/dri/i830/i830_screen.h b/src/mesa/drivers/dri/i830/i830_screen.h
index eabb6084ad4..edbe719e05e 100644
--- a/src/mesa/drivers/dri/i830/i830_screen.h
+++ b/src/mesa/drivers/dri/i830/i830_screen.h
@@ -41,7 +41,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 typedef struct {
-   drmHandle handle;
+   drm_handle_t handle;
    drmSize size;
    char *map;
 } i830Region, *i830RegionPtr;
diff --git a/src/mesa/drivers/dri/i830/server/i830_dri.h b/src/mesa/drivers/dri/i830/server/i830_dri.h
index bc123302956..6477f4e79ff 100644
--- a/src/mesa/drivers/dri/i830/server/i830_dri.h
+++ b/src/mesa/drivers/dri/i830/server/i830_dri.h
@@ -16,20 +16,20 @@
 #define I830_REG_SIZE 0x80000
 
 typedef struct _I830DRIRec {
-   drmHandle regs;
+   drm_handle_t regs;
    drmSize regsSize;
    drmAddress regsMap;
 
    drmSize backbufferSize;
-   drmHandle backbuffer;
+   drm_handle_t backbuffer;
 
    drmSize depthbufferSize;
-   drmHandle depthbuffer;
+   drm_handle_t depthbuffer;
 
-   drmHandle textures;
+   drm_handle_t textures;
    int textureSize;
 
-   drmHandle agp_buffers;
+   drm_handle_t agp_buffers;
    drmSize agp_buf_size;
 
    int deviceID;