Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGE

2 files changed, 7 insertions, 7 deletions

diff --git a/src/xvmc/I810XvMC.c b/src/xvmc/I810XvMC.c
index fdafe8cb..893a7112 100644
--- a/src/xvmc/I810XvMC.c
+++ b/src/xvmc/I810XvMC.c
@@ -227,7 +227,7 @@ Status XvMCCreateContext(Display *display, XvPortID port,
   context->flags = (unsigned long)magic;
 
   /*
-    Pass control to the X server to create a drmContext for us and
+    Pass control to the X server to create a drm_context_t for us and
     validate the with/height and flags.
   */
   if((ret = _xvmc_create_context(display, context, &priv_count, &priv_data))) {
@@ -237,7 +237,7 @@ Status XvMCCreateContext(Display *display, XvPortID port,
 
   /* 
      X server returns a structure like this:
-     drmContext
+     drm_context_t
      fbBase
      OverlayOffset
      OverlaySize
@@ -411,7 +411,7 @@ Status XvMCDestroyContext(Display *display, XvMCContext *context) {
     I810_UNLOCK(pI810XvMC);
   }
 
-  /* Pass Control to the X server to destroy the drmContext */
+  /* Pass Control to the X server to destroy the drm_context_t */
   _xvmc_destroy_context(display, context);
 
   i810_free_privContext(pI810XvMC);
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;