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, 17 insertions, 19 deletions

diff --git a/xorg-server/Xext/xres.c b/xorg-server/Xext/xres.c
index cac2e12ab..32e8c8135 100644..100755
--- a/xorg-server/Xext/xres.c
+++ b/xorg-server/Xext/xres.c
@@ -193,7 +193,6 @@ DestroyConstructResourceBytesCtx(ConstructResourceBytesCtx *ctx)
 static int
 ProcXResQueryVersion(ClientPtr client)
 {
-    REQUEST(xXResQueryVersionReq);
     xXResQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH(xXResQueryVersionReq);
@@ -266,7 +265,7 @@ ProcXResQueryClients(ClientPtr client)
 }
 
 static void
-ResFindAllRes(pointer value, XID id, RESTYPE type, pointer cdata)
+ResFindAllRes(void *value, XID id, RESTYPE type, void *cdata)
 {
     int *counts = (int *) cdata;
 
@@ -363,7 +362,7 @@ ResGetApproxPixmapBytes(PixmapPtr pix)
 }
 
 static void
-ResFindResourcePixmaps(pointer value, XID id, RESTYPE type, pointer cdata)
+ResFindResourcePixmaps(void *value, XID id, RESTYPE type, void *cdata)
 {
     SizeType sizeFunc = GetResourceTypeSizeFunc(type);
     ResourceSizeRec size = { 0, 0, 0 };
@@ -374,7 +373,7 @@ ResFindResourcePixmaps(pointer value, XID id, RESTYPE type, pointer cdata)
 }
 
 static void 
-ResFindPixmaps(pointer value, XID id, pointer cdata)
+ResFindPixmaps(void *value, XID id, void *cdata)
 {
     unsigned long *bytes = (unsigned long *) cdata;
     PixmapPtr pix = (PixmapPtr) value;
@@ -383,7 +382,7 @@ ResFindPixmaps(pointer value, XID id, pointer cdata)
 }
 
 static void
-ResFindWindowPixmaps(pointer value, XID id, pointer cdata)
+ResFindWindowPixmaps(void *value, XID id, void *cdata)
 {
     unsigned long *bytes = (unsigned long *) cdata;
     WindowPtr pWin = (WindowPtr) value;
@@ -396,7 +395,7 @@ ResFindWindowPixmaps(pointer value, XID id, pointer cdata)
 }
 
 static void
-ResFindGCPixmaps(pointer value, XID id, pointer cdata)
+ResFindGCPixmaps(void *value, XID id, void *cdata)
 {
     unsigned long *bytes = (unsigned long *) cdata;
     GCPtr pGC = (GCPtr) value;
@@ -409,7 +408,7 @@ ResFindGCPixmaps(pointer value, XID id, pointer cdata)
 }
 
 static void
-ResFindPicturePixmaps(pointer value, XID id, pointer cdata)
+ResFindPicturePixmaps(void *value, XID id, void *cdata)
 {
 #ifdef RENDER
     ResFindResourcePixmaps(value, id, PictureType, cdata);
@@ -417,7 +416,7 @@ ResFindPicturePixmaps(pointer value, XID id, pointer cdata)
 }
 
 static void
-ResFindCompositeClientWindowPixmaps (pointer value, XID id, pointer cdata)
+ResFindCompositeClientWindowPixmaps (void *value, XID id, void *cdata)
 {
 #ifdef COMPOSITE
     ResFindResourcePixmaps(value, id, CompositeClientWindowType, cdata);
@@ -444,32 +443,32 @@ ProcXResQueryClientPixmapBytes(ClientPtr client)
     bytes = 0;
 
     FindClientResourcesByType(clients[clientID], RT_PIXMAP, ResFindPixmaps,
-                              (pointer) (&bytes));
+                              (void *) (&bytes));
 
     /* 
      * Make sure win background pixmaps also held to account. 
      */
     FindClientResourcesByType(clients[clientID], RT_WINDOW,
-                              ResFindWindowPixmaps, (pointer) (&bytes));
+                              ResFindWindowPixmaps, (void *) (&bytes));
 
     /* 
      * GC Tile & Stipple pixmaps too.
      */
     FindClientResourcesByType(clients[clientID], RT_GC,
-                              ResFindGCPixmaps, (pointer) (&bytes));
+                              ResFindGCPixmaps, (void *) (&bytes));
 
 #ifdef RENDER
     /* Render extension picture pixmaps. */
     FindClientResourcesByType(clients[clientID], PictureType,
                               ResFindPicturePixmaps,
-                              (pointer)(&bytes));
+                              (void *)(&bytes));
 #endif
 
 #ifdef COMPOSITE
     /* Composite extension client window pixmaps. */
     FindClientResourcesByType(clients[clientID], CompositeClientWindowType,
                               ResFindCompositeClientWindowPixmaps,
-                              (pointer)(&bytes));
+                              (void *)(&bytes));
 #endif
 
 
@@ -749,10 +748,10 @@ SwapXResQueryResourceBytes(struct xorg_list *response)
                         FindRes
 */
 static void
-AddSubResourceSizeSpec(pointer value,
+AddSubResourceSizeSpec(void *value,
                        XID id,
                        RESTYPE type,
-                       pointer cdata)
+                       void *cdata)
 {
     ConstructResourceBytesCtx *ctx = cdata;
 
@@ -814,7 +813,7 @@ AddSubResourceSizeSpec(pointer value,
                         FindRes
 */
 static void
-AddResourceSizeValue(pointer ptr, XID id, RESTYPE type, pointer cdata)
+AddResourceSizeValue(void *ptr, XID id, RESTYPE type, void *cdata)
 {
     ConstructResourceBytesCtx *ctx = cdata;
     if (ctx->status == Success &&
@@ -884,7 +883,7 @@ AddResourceSizeValue(pointer ptr, XID id, RESTYPE type, pointer cdata)
    @param[in/out] cdata  The context object that contains the resource type
 */
 static void
-AddResourceSizeValueWithResType(pointer ptr, XID id, pointer cdata)
+AddResourceSizeValueWithResType(void *ptr, XID id, void *cdata)
 {
     ConstructResourceBytesCtx *ctx = cdata;
     AddResourceSizeValue(ptr, id, ctx->resType, cdata);
@@ -902,7 +901,7 @@ AddResourceSizeValueWithResType(pointer ptr, XID id, pointer cdata)
                          type FindAllRes
 */
 static void
-AddResourceSizeValueByResource(pointer ptr, XID id, RESTYPE type, pointer cdata)
+AddResourceSizeValueByResource(void *ptr, XID id, RESTYPE type, void *cdata)
 {
     ConstructResourceBytesCtx *ctx = cdata;
     xXResResourceIdSpec *spec = ctx->curSpec;
@@ -1097,7 +1096,6 @@ ProcResDispatch(ClientPtr client)
 static int
 SProcXResQueryVersion(ClientPtr client)
 {
-    REQUEST(xXResQueryVersionReq);
     REQUEST_SIZE_MATCH(xXResQueryVersionReq);
     return ProcXResQueryVersion(client);
 }