Merge remote-tracking branch 'origin/released'

* origin/released:
  mesa xkeyboard-config xserver git update 15 jan 2014
  randrproto libfontenc mesa xserver git update 10 Jan 2014
  randsrproto fontconfig libX11 git update 6 Jan 2014

Conflicts:
	mesalib/src/glsl/builtin_functions.cpp
	mesalib/src/glsl/ir_builder.h
	xorg-server/Xext/xres.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/include/gc.h
	xorg-server/os/access.c

1 files changed, 6 insertions, 6 deletions

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 */