Merge remote-tracking branch 'origin/released'

* origin/released:
  libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014

Conflicts:
	mesalib/src/mapi/glapi/glapi.h
	mesalib/src/mapi/glapi/glthread.c
	mesalib/src/mesa/drivers/dri/common/dri_util.c
	mesalib/src/mesa/main/bufferobj.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/winmultiwindowwm.c

1 files changed, 3 insertions, 3 deletions

diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index d73ef1903..cbd5c7ad5 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -2031,10 +2031,10 @@ CheckUserAuthorization(void)
  * Tokenize a string into a NULL terminated array of strings. Always returns
  * an allocated array unless an error occurs.
  */
-const char **
+char **
 xstrtokenize(const char *str, const char *separators)
 {
-    const char **list, **nlist;
+    char **list, **nlist;
     char *tok, *tmp;
     unsigned num = 0, n;
 
@@ -2062,7 +2062,7 @@ xstrtokenize(const char *str, const char *separators)
  error:
     free(tmp);
     for (n = 0; n < num; n++)
-        free((void *) list[n]);
+        free(list[n]);
     free(list);
     return NULL;
 }