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, 5 insertions, 5 deletions

diff --git a/xorg-server/include/callback.h b/xorg-server/include/callback.h
index b4249e8a5..ffdbac270 100644
--- a/xorg-server/include/callback.h
+++ b/xorg-server/include/callback.h
@@ -66,21 +66,21 @@ typedef struct _CallbackList *CallbackListPtr;  /* also in misc.h */
 #define _XTYPEDEF_CALLBACKLISTPTR
 #endif
 
-typedef void (*CallbackProcPtr) (CallbackListPtr *, pointer, pointer);
+typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *);
 
 extern _X_EXPORT Bool AddCallback(CallbackListPtr * /*pcbl */ ,
                                   CallbackProcPtr /*callback */ ,
-                                  pointer /*data */ );
+                                  void */*data */ );
 
 extern _X_EXPORT Bool DeleteCallback(CallbackListPtr * /*pcbl */ ,
                                      CallbackProcPtr /*callback */ ,
-                                     pointer /*data */ );
+                                     void */*data */ );
 
 extern _X_EXPORT void _CallCallbacks(CallbackListPtr * /*pcbl */ ,
-                                     pointer /*call_data */ );
+                                     void */*call_data */ );
 
 static inline void
-CallCallbacks(CallbackListPtr *pcbl, pointer call_data)
+CallCallbacks(CallbackListPtr *pcbl, void *call_data)
 {
     if (!pcbl || !*pcbl)
         return;