Mop-up from the DRI 20040613 import, taking care of some drm.h

header location and type changes, and update the ChangeLog.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/xvmc/I810XvMC.h b/src/xvmc/I810XvMC.h
index cfcab88f..ba8c792d 100644
--- a/src/xvmc/I810XvMC.h
+++ b/src/xvmc/I810XvMC.h
@@ -86,7 +86,7 @@ typedef struct _i810OverlayRec {
 // i810XvMCDrmMap: Holds the data about the DRM maps
 ***************************************************************************/
 typedef struct _i810XvMCDrmMap {
-  drmHandle offset;
+  drm_handle_t offset;
   drmAddress address;
   unsigned int size;
 } i810XvMCDrmMap, *i810XvMCDrmMapPtr;
@@ -100,7 +100,7 @@ typedef struct _i810XvMCContext {
   i810XvMCDrmMap overlay;
   i810XvMCDrmMap surfaces;
   drmBufMapPtr dmabufs;  /* Data structure to hold available dma buffers */
-  drmContext drmcontext;
+  drm_context_t drmcontext;
   unsigned int last_render;
   unsigned int last_flip;
   unsigned short ref;
@@ -144,7 +144,7 @@ typedef struct _i810XvMCSurface {
   unsigned int last_flip;
   unsigned int second_field; /* Flags a surface that is only half done */
   drmAddress data;
-  drmHandle offset;
+  drm_handle_t offset;
   unsigned int offsets[3];
   i810XvMCContext *privContext;
 } i810XvMCSurface;
@@ -164,7 +164,7 @@ typedef struct _i810XvMCSubpicture {
   unsigned int last_render;
   unsigned int last_flip;
   drmAddress data;
-  drmHandle offset;
+  drm_handle_t offset;
   unsigned int offsets[1];
   unsigned char palette[3][16];
   i810XvMCContext *privContext;