mesa xkeyboard-config xserver git update 15 jan 2014

xserver          commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa             commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43

1 files changed, 4 insertions, 4 deletions

diff --git a/xorg-server/config/dbus-core.c b/xorg-server/config/dbus-core.c
index 324258718..768a98454 100644
--- a/xorg-server/config/dbus-core.c
+++ b/xorg-server/config/dbus-core.c
@@ -45,10 +45,10 @@ struct dbus_core_info {
 };
 static struct dbus_core_info bus_info;
 
-static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg);
+static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, void *arg);
 
 static void
-wakeup_handler(pointer data, int err, pointer read_mask)
+wakeup_handler(void *data, int err, void *read_mask)
 {
     struct dbus_core_info *info = data;
 
@@ -63,7 +63,7 @@ wakeup_handler(pointer data, int err, pointer read_mask)
 }
 
 static void
-block_handler(pointer data, struct timeval **tv, pointer read_mask)
+block_handler(void *data, struct timeval **tv, void *read_mask)
 {
 }
 
@@ -185,7 +185,7 @@ connect_to_bus(void)
 }
 
 static CARD32
-reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg)
+reconnect_timer(OsTimerPtr timer, CARD32 time, void *arg)
 {
     if (connect_to_bus()) {
         TimerFree(bus_info.timer);