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/xfixes/select.c b/xorg-server/xfixes/select.c
index 17fb0b583..5a6be7d57 100644
--- a/xorg-server/xfixes/select.c
+++ b/xorg-server/xfixes/select.c
@@ -51,7 +51,7 @@ typedef struct _SelectionEvent {
 static SelectionEventPtr selectionEvents;
 
 static void
-XFixesSelectionCallback(CallbackListPtr *callbacks, pointer data, pointer args)
+XFixesSelectionCallback(CallbackListPtr *callbacks, void *data, void *args)
 {
     SelectionEventPtr e;
     SelectionInfoRec *info = (SelectionInfoRec *) args;
@@ -118,7 +118,7 @@ static int
 XFixesSelectSelectionInput(ClientPtr pClient,
                            Atom selection, WindowPtr pWindow, CARD32 eventMask)
 {
-    pointer val;
+    void *val;
     int rc;
     SelectionEventPtr *prev, e;
 
@@ -158,12 +158,12 @@ XFixesSelectSelectionInput(ClientPtr pClient,
                                      DixGetAttrAccess);
         if (rc != Success)
             if (!AddResource(pWindow->drawable.id, SelectionWindowType,
-                             (pointer) pWindow)) {
+                             (void *) pWindow)) {
                 free(e);
                 return BadAlloc;
             }
 
-        if (!AddResource(e->clientResource, SelectionClientType, (pointer) e))
+        if (!AddResource(e->clientResource, SelectionClientType, (void *) e))
             return BadAlloc;
 
         *prev = e;
@@ -221,7 +221,7 @@ SXFixesSelectionNotifyEvent(xXFixesSelectionNotifyEvent * from,
 }
 
 static int
-SelectionFreeClient(pointer data, XID id)
+SelectionFreeClient(void *data, XID id)
 {
     SelectionEventPtr old = (SelectionEventPtr) data;
     SelectionEventPtr *prev, e;
@@ -238,7 +238,7 @@ SelectionFreeClient(pointer data, XID id)
 }
 
 static int
-SelectionFreeWindow(pointer data, XID id)
+SelectionFreeWindow(void *data, XID id)
 {
     WindowPtr pWindow = (WindowPtr) data;
     SelectionEventPtr e, next;