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

diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c
index dce3c9fba..b7c53a461 100644
--- a/xorg-server/Xext/security.c
+++ b/xorg-server/Xext/security.c
@@ -169,7 +169,7 @@ SecurityLookupRequestName(ClientPtr client)
  */
 
 static int
-SecurityDeleteAuthorization(pointer value, XID id)
+SecurityDeleteAuthorization(void *value, XID id)
 {
     SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value;
     unsigned short name_len, data_len;
@@ -223,7 +223,7 @@ SecurityDeleteAuthorization(pointer value, XID id)
 
 /* resource delete function for RTEventClient */
 static int
-SecurityDeleteAuthorizationEventClient(pointer value, XID id)
+SecurityDeleteAuthorizationEventClient(void *value, XID id)
 {
     OtherClientsPtr pEventClient, prev = NULL;
     SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value;
@@ -296,7 +296,7 @@ SecurityComputeAuthorizationTimeout(SecurityAuthorizationPtr pAuth,
  */
 
 static CARD32
-SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, pointer pval)
+SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, void *pval)
 {
     SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) pval;
 
@@ -382,7 +382,7 @@ SecurityEventSelectForAuthorization(SecurityAuthorizationPtr pAuth,
     pEventClient->mask = mask;
     pEventClient->resource = FakeClientID(client->index);
     pEventClient->next = pAuth->eventClients;
-    if (!AddResource(pEventClient->resource, RTEventClient, (pointer) pAuth)) {
+    if (!AddResource(pEventClient->resource, RTEventClient, (void *) pAuth)) {
         free(pEventClient);
         return BadAlloc;
     }
@@ -454,7 +454,7 @@ ProcSecurityGenerateAuthorization(ClientPtr client)
 
             vgi.group = group;
             vgi.valid = FALSE;
-            CallCallbacks(&SecurityValidateGroupCallback, (pointer) &vgi);
+            CallCallbacks(&SecurityValidateGroupCallback, (void *) &vgi);
 
             /* if nobody said they recognized it, it's an error */
 
@@ -574,7 +574,7 @@ ProcSecurityRevokeAuthorization(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq);
 
-    rc = dixLookupResourceByType((pointer *) &pAuth, stuff->authId,
+    rc = dixLookupResourceByType((void **) &pAuth, stuff->authId,
                                  SecurityAuthorizationResType, client,
                                  DixDestroyAccess);
     if (rc != Success)
@@ -692,7 +692,7 @@ SwapSecurityAuthorizationRevokedEvent(xSecurityAuthorizationRevokedEvent * from,
  */
 
 static void
-SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityDevice(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     XaceDeviceAccessRec *rec = calldata;
     SecurityStateRec *subj, *obj;
@@ -736,7 +736,7 @@ SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
  */
 
 static void
-SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityResource(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     XaceResourceAccessRec *rec = calldata;
     SecurityStateRec *subj, *obj;
@@ -784,7 +784,7 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 }
 
 static void
-SecurityExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityExtension(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     XaceExtAccessRec *rec = calldata;
     SecurityStateRec *subj;
@@ -807,7 +807,7 @@ SecurityExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 }
 
 static void
-SecurityServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityServer(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     XaceServerAccessRec *rec = calldata;
     SecurityStateRec *subj, *obj;
@@ -826,7 +826,7 @@ SecurityServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 }
 
 static void
-SecurityClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityClient(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     XaceClientAccessRec *rec = calldata;
     SecurityStateRec *subj, *obj;
@@ -845,7 +845,7 @@ SecurityClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 }
 
 static void
-SecurityProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityProperty(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     XacePropertyAccessRec *rec = calldata;
     SecurityStateRec *subj, *obj;
@@ -867,7 +867,7 @@ SecurityProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 }
 
 static void
-SecuritySend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecuritySend(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     XaceSendAccessRec *rec = calldata;
     SecurityStateRec *subj, *obj;
@@ -899,7 +899,7 @@ SecuritySend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 }
 
 static void
-SecurityReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityReceive(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     XaceReceiveAccessRec *rec = calldata;
     SecurityStateRec *subj, *obj;
@@ -940,7 +940,7 @@ SecurityReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
  */
 
 static void
-SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityClientState(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     NewClientInfoRec *pci = calldata;
     SecurityStateRec *state;
@@ -959,7 +959,7 @@ SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
     case ClientStateRunning:
         state->authId = AuthorizationIDOfClient(pci->client);
-        rc = dixLookupResourceByType((pointer *) &pAuth, state->authId,
+        rc = dixLookupResourceByType((void **) &pAuth, state->authId,
                                      SecurityAuthorizationResType, serverClient,
                                      DixGetAttrAccess);
         if (rc == Success) {
@@ -975,7 +975,7 @@ SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
     case ClientStateGone:
     case ClientStateRetained:
-        rc = dixLookupResourceByType((pointer *) &pAuth, state->authId,
+        rc = dixLookupResourceByType((void **) &pAuth, state->authId,
                                      SecurityAuthorizationResType, serverClient,
                                      DixGetAttrAccess);
         if (rc == Success && state->live) {