From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 15 Jan 2014 21:23:25 +0100 Subject: mesa xkeyboard-config xserver git update 15 jan 2014 xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 --- xorg-server/Xext/xvmcext.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'xorg-server/Xext/xvmcext.h') diff --git a/xorg-server/Xext/xvmcext.h b/xorg-server/Xext/xvmcext.h index 2201d7b5b..e8a6dae47 100644 --- a/xorg-server/Xext/xvmcext.h +++ b/xorg-server/Xext/xvmcext.h @@ -31,15 +31,15 @@ typedef struct { unsigned short height; CARD32 flags; int refcnt; - pointer port_priv; - pointer driver_priv; + void *port_priv; + void *driver_priv; } XvMCContextRec, *XvMCContextPtr; typedef struct { XID surface_id; int surface_type_id; XvMCContextPtr context; - pointer driver_priv; + void *driver_priv; } XvMCSurfaceRec, *XvMCSurfacePtr; typedef struct { @@ -51,7 +51,7 @@ typedef struct { int entry_bytes; char component_order[4]; XvMCContextPtr context; - pointer driver_priv; + void *driver_priv; } XvMCSubpictureRec, *XvMCSubpicturePtr; typedef int (*XvMCCreateContextProcPtr) (XvPortPtr port, @@ -91,8 +91,8 @@ extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen, extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id); -extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name, - char *busID, int major, int minor, +extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, const char *name, + const char *busID, int major, int minor, int patchLevel); #endif /* _XVMC_H */ -- cgit v1.2.3