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

drm_handle_t, drm_context_t, drm_drawable_t, drm_magic_t.

2 files changed, 8 insertions, 8 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
index ba4f70675..a85cb8043 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
@@ -54,7 +54,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 static char GLINTKernelDriverName[] = "gamma";
 static char GLINTClientDriverName[] = "gamma";
 
-static void GLINTDestroyContext(ScreenPtr pScreen, drmContext hwContext,
+static void GLINTDestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
                                 DRIContextType contextStore);
 
 
@@ -639,7 +639,7 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
     /* pci region 0: control regs, first 4k page, priveledged writes */
     pGlintDRI->registers0.size = 0x1000;
     if (drmAddMap( pGlint->drmSubFD,
-		   (drmHandle)pGlint->IOAddress,
+		   (drm_handle_t)pGlint->IOAddress,
 		   pGlintDRI->registers0.size,
 		   DRM_REGISTERS, DRM_READ_ONLY,
 		   &pGlintDRI->registers0.handle) < 0)
@@ -654,7 +654,7 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
     /* pci region 0: control regs, following region, client access */
     pGlintDRI->registers1.size = 0xf000;
     if (drmAddMap( pGlint->drmSubFD,
-		   (drmHandle)(pGlint->IOAddress + 0x1000),
+		   (drm_handle_t)(pGlint->IOAddress + 0x1000),
 		   pGlintDRI->registers1.size,
 		   DRM_REGISTERS, 0,
 		   &pGlintDRI->registers1.handle) < 0)
@@ -669,7 +669,7 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
     /* pci region 0: control regs, second MX, first 4k page */
     pGlintDRI->registers2.size = 0x1000;
     if (drmAddMap( pGlint->drmSubFD,
-		   (drmHandle)(pGlint->IOAddress + 0x10000),
+		   (drm_handle_t)(pGlint->IOAddress + 0x10000),
 		   pGlintDRI->registers2.size,
 		   DRM_REGISTERS, DRM_READ_ONLY,
 		   &pGlintDRI->registers2.handle) < 0)
@@ -684,7 +684,7 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
     /* pci region 0: control regs, second MX, following region */
     pGlintDRI->registers3.size = 0xf000;
     if (drmAddMap( pGlint->drmSubFD,
-		   (drmHandle)(pGlint->IOAddress + 0x11000),
+		   (drm_handle_t)(pGlint->IOAddress + 0x11000),
 		   pGlintDRI->registers3.size,
 		   DRM_REGISTERS, 0,
 		   &pGlintDRI->registers3.handle) < 0)
@@ -828,7 +828,7 @@ GLINTDRICloseScreen(ScreenPtr pScreen)
 Bool
 GLINTCreateContext(ScreenPtr pScreen,
                    VisualPtr visual,
-                   drmContext hwContext,
+                   drm_context_t hwContext,
                    void *pVisualConfigPriv,
 		   DRIContextType contextStore)
 {
@@ -859,7 +859,7 @@ GLINTCreateContext(ScreenPtr pScreen,
 
 static void
 GLINTDestroyContext(ScreenPtr pScreen,
-                    drmContext hwContext,
+                    drm_context_t hwContext,
                     DRIContextType contextStore)
 {
 }
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h
index 15d5e487e..bb8648091 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h
@@ -41,7 +41,7 @@ extern void GlxSetVisualConfigs(
 
 extern Bool GLINTCreateContext(ScreenPtr pScreen,
                                VisualPtr visual,
-                               drmContext hwContext,
+                               drm_context_t hwContext,
                                void* pVisualConfigPriv,
 			       DRIContextType contextStore);