1 files changed, 12 insertions, 11 deletions

diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index bc8a17ad2..ae5a6d608 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -35,8 +35,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
-#ifdef XFree86LOADER
 #include "xf86.h"
+#ifdef XFree86LOADER
 #include "xf86_ansic.h"
 #endif
 
@@ -54,6 +54,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define _XF86DRI_SERVER_
 #include "xf86dristr.h"
 #include "swaprep.h"
+#include "xf86str.h"
 #include "dri.h"
 #include "sarea.h"
 #include "dristruct.h"
@@ -184,7 +185,7 @@ ProcXF86DRIOpenConnection(
 )
 {
     xXF86DRIOpenConnectionReply rep;
-    drmHandle			hSAREA;
+    drm_handle_t			hSAREA;
     char*			busIdString;
 
     REQUEST(xXF86DRIOpenConnectionReq);
@@ -340,7 +341,7 @@ ProcXF86DRICreateContext(
     if (!DRICreateContext( pScreen,
 			   visual,
 			   stuff->context,
-			   (drmContextPtr)&rep.hHWContext)) {
+			   (drm_context_t *)&rep.hHWContext)) {
 	return BadValue;
     }
 
@@ -397,7 +398,7 @@ ProcXF86DRICreateDrawable(
     if (!DRICreateDrawable( screenInfo.screens[stuff->screen],
 			    (Drawable)stuff->drawable,
 			    pDrawable,
-			    (drmDrawablePtr)&rep.hHWDrawable)) {
+			    (drm_drawable_t *)&rep.hHWDrawable)) {
 	return BadValue;
     }
 
@@ -442,8 +443,8 @@ ProcXF86DRIGetDrawableInfo(
     xXF86DRIGetDrawableInfoReply	rep;
     DrawablePtr pDrawable;
     int X, Y, W, H;
-    XF86DRIClipRectPtr pClipRects;
-    XF86DRIClipRectPtr pBackClipRects;
+    drm_clip_rect_t * pClipRects;
+    drm_clip_rect_t * pBackClipRects;
     int backX, backY;
 
     REQUEST(xXF86DRIGetDrawableInfoReq);
@@ -492,10 +493,10 @@ ProcXF86DRIGetDrawableInfo(
     rep.backY = backY;
         
     if (rep.numBackClipRects) 
-       rep.length += sizeof(XF86DRIClipRectRec) * rep.numBackClipRects;    
+       rep.length += sizeof(drm_clip_rect_t) * rep.numBackClipRects;    
 
     if (rep.numClipRects) 
-       rep.length += sizeof(XF86DRIClipRectRec) * rep.numClipRects;
+       rep.length += sizeof(drm_clip_rect_t) * rep.numClipRects;
     
     rep.length = ((rep.length + 3) & ~3) >> 2;
 
@@ -503,13 +504,13 @@ ProcXF86DRIGetDrawableInfo(
 
     if (rep.numClipRects) {
 	WriteToClient(client,  
-		      sizeof(XF86DRIClipRectRec) * rep.numClipRects,
+		      sizeof(drm_clip_rect_t) * rep.numClipRects,
 		      (char *)pClipRects);
     }
 
     if (rep.numBackClipRects) {
        WriteToClient(client, 
-		     sizeof(XF86DRIClipRectRec) * rep.numBackClipRects,
+		     sizeof(drm_clip_rect_t) * rep.numBackClipRects,
 		     (char *)pBackClipRects);
     }
 
@@ -522,7 +523,7 @@ ProcXF86DRIGetDeviceInfo(
 )
 {
     xXF86DRIGetDeviceInfoReply	rep;
-    drmHandle hFrameBuffer;
+    drm_handle_t hFrameBuffer;
     void *pDevPrivate;
 
     REQUEST(xXF86DRIGetDeviceInfoReq);