diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-22 15:24:46 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-22 15:44:58 +1000 |
| commit | b395da91c531d633ec47bb5a51e361d321663a3a (patch) | |
| tree | 40ad8f475e03e5b1cc6d54a438e38e1ba72f48e6 | |
| parent | 4a36db60774640ea92a2133a3b08fbf1a48d2cb6 (diff) | |
Xi: silence two compiler warnings
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 <peter.hutterer@who-t.net>
| -rw-r--r-- | Xi/chdevcur.c | 10 | ||||
| -rw-r--r-- | Xi/xiproperty.c | 3 |
2 files changed, 6 insertions, 7 deletions
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) |