From b395da91c531d633ec47bb5a51e361d321663a3a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 22 May 2009 15:24:46 +1000 Subject: Xi: silence two compiler warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chdevcur.c:97: warning: ‘SecurityLookupIDByType’ is deprecated (declared at ../include/resource.h:269) xiproperty.c:200: warning: passing argument 2 of ‘GetEventFilter’ from incompatible pointer type Signed-off-by: Peter Hutterer --- Xi/chdevcur.c | 10 ++++------ Xi/xiproperty.c | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'Xi') diff --git a/Xi/chdevcur.c b/Xi/chdevcur.c index 0315edba5..977095cac 100644 --- a/Xi/chdevcur.c +++ b/Xi/chdevcur.c @@ -94,12 +94,10 @@ int ProcXIChangeCursor(ClientPtr client) } else { - pCursor = (CursorPtr)SecurityLookupIDByType(client, stuff->cursor, - RT_CURSOR, DixReadAccess); - if (!pCursor) - { - return BadCursor; - } + rc = dixLookupResourceByType((pointer*)&pCursor, stuff->cursor, + RT_CURSOR, client, DixReadAccess); + if (rc != Success) + return rc; } ChangeWindowDeviceCursor(pWin, pDev, pCursor); diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c index 3cda82b6e..cd4946026 100644 --- a/Xi/xiproperty.c +++ b/Xi/xiproperty.c @@ -197,7 +197,8 @@ static void send_property_event(DeviceIntPtr dev, Atom property, int what) xi2.time = currentTime.milliseconds; xi2.property = property; xi2.what = what; - SendEventToAllWindows(dev, GetEventFilter(dev, &xi2), (xEvent*)&xi2, 1); + SendEventToAllWindows(dev, GetEventFilter(dev, (xEvent*)&xi2), + (xEvent*)&xi2, 1); } static int list_atoms(DeviceIntPtr dev, int *natoms, Atom **atoms_return) -- cgit v1.2.3