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/xkb/xkbInit.c b/xorg-server/xkb/xkbInit.c
index b7c521b12..d3bcbc9f2 100644
--- a/xorg-server/xkb/xkbInit.c
+++ b/xorg-server/xkb/xkbInit.c
@@ -129,11 +129,11 @@ XkbFreeRMLVOSet(XkbRMLVOSet * rmlvo, Bool freeRMLVO)
     if (!rmlvo)
         return;
 
-    free(rmlvo->rules);
-    free(rmlvo->model);
-    free(rmlvo->layout);
-    free(rmlvo->variant);
-    free(rmlvo->options);
+    free((void *) rmlvo->rules);
+    free((void *) rmlvo->model);
+    free((void *) rmlvo->layout);
+    free((void *) rmlvo->variant);
+    free((void *) rmlvo->options);
 
     if (freeRMLVO)
         free(rmlvo);
@@ -142,7 +142,7 @@ XkbFreeRMLVOSet(XkbRMLVOSet * rmlvo, Bool freeRMLVO)
 }
 
 static Bool
-XkbWriteRulesProp(ClientPtr client, pointer closure)
+XkbWriteRulesProp(ClientPtr client, void *closure)
 {
     int len, out;
     Atom name;