1 files changed, 28 insertions, 33 deletions

diff --git a/lib/libXvMC/src/XvMClibint.h b/lib/libXvMC/src/XvMClibint.h
index 195a77d9b..a6ac5f299 100644
--- a/lib/libXvMC/src/XvMClibint.h
+++ b/lib/libXvMC/src/XvMClibint.h
@@ -9,56 +9,51 @@
 #define XvMCCheckExtension(dpy, i, val) \
   XextCheckExtension(dpy, i, xvmc_extension_name, val)
 
-
+/* names in XvMCproto.h don't match the expectation of Xlib's GetReq* macros,
+   so we have to provide our own implementation */
 #define XvMCGetReq(name, req) \
-        WORD64ALIGN\
-	if ((dpy->bufptr + sizeof(xvmc##name##Req)) > dpy->bufmax)\
-		_XFlush(dpy);\
-	req = (xvmc##name##Req *)(dpy->last_req = dpy->bufptr);\
-	req->reqType = info->codes->major_opcode;\
-        req->xvmcReqType = xvmc_##name; \
-        req->length = sizeof(xvmc##name##Req)>>2;\
-	dpy->bufptr += sizeof(xvmc##name##Req);\
-	dpy->request++
+        req = (xvmc##name##Req *) _XGetRequest(                               \
+            dpy, (CARD8) info->codes->major_opcode, sizeof(xvmc##name##Req)); \
+        req->xvmcReqType = xvmc_##name
 
 _XFUNCPROTOBEGIN
 
 Status _xvmc_create_context(
-    Display *		/* dpy */,
-    XvMCContext *	/* context */,
-    int *		/* priv_count */,
-    CARD32 **		/* priv_data */
+    Display *           /* dpy */,
+    XvMCContext *       /* context */,
+    int *               /* priv_count */,
+    CARD32 **           /* priv_data */
 );
 
 Status _xvmc_destroy_context(
-    Display *		/* dpy */,
-    XvMCContext *	/* context */
+    Display *           /* dpy */,
+    XvMCContext *       /* context */
 );
 
-Status _xvmc_create_surface (
-    Display *		/* dpy */,
-    XvMCContext *	/* context */,
-    XvMCSurface *	/* surface */,
-    int *		/* priv_count */,
-    CARD32 **		/* priv_data */
+Status _xvmc_create_surface(
+    Display *           /* dpy */,
+    XvMCContext *       /* context */,
+    XvMCSurface *       /* surface */,
+    int *               /* priv_count */,
+    CARD32 **           /* priv_data */
 );
 
-Status _xvmc_destroy_surface (
-    Display *		/* dpy */,
-    XvMCSurface *	/* surface */
+Status _xvmc_destroy_surface(
+    Display *           /* dpy */,
+    XvMCSurface *       /* surface */
 );
 
-Status _xvmc_create_subpicture (
-    Display *		/* dpy */,
-    XvMCContext *	/* context */,
-    XvMCSubpicture *	/* subpicture */,
-    int *		/* priv_count */,
-    CARD32 **		/* priv_data */
+Status _xvmc_create_subpicture(
+    Display *           /* dpy */,
+    XvMCContext *       /* context */,
+    XvMCSubpicture *    /* subpicture */,
+    int *               /* priv_count */,
+    CARD32 **           /* priv_data */
 );
 
 Status _xvmc_destroy_subpicture(
-    Display *		/* dpy */,
-    XvMCSubpicture *	/* subpicture */
+    Display *           /* dpy */,
+    XvMCSubpicture *    /* subpicture */
 );
 
 _XFUNCPROTOEND