From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 15 Jan 2014 21:23:25 +0100 Subject: mesa xkeyboard-config xserver git update 15 jan 2014 xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 --- xorg-server/present/present_event.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xorg-server/present/present_event.c') diff --git a/xorg-server/present/present_event.c b/xorg-server/present/present_event.c index f0d509ed4..ff57eba41 100644 --- a/xorg-server/present/present_event.c +++ b/xorg-server/present/present_event.c @@ -29,7 +29,7 @@ RESTYPE present_event_type; static int -present_free_event(pointer data, XID id) +present_free_event(void *data, XID id) { present_event_ptr present_event = (present_event_ptr) data; present_window_priv_ptr window_priv = present_window_priv(present_event->window); @@ -41,7 +41,7 @@ present_free_event(pointer data, XID id) break; } } - free((pointer) present_event); + free((void *) present_event); return 1; } @@ -229,7 +229,7 @@ present_select_input(ClientPtr client, XID eid, WindowPtr window, CARD32 mask) event->next = window_priv->events; window_priv->events = event; - if (!AddResource(event->id, present_event_type, (pointer) event)) + if (!AddResource(event->id, present_event_type, (void *) event)) return BadAlloc; return Success; -- cgit v1.2.3