diff options
Diffstat (limited to 'xorg-server/Xi/exevents.c')
| -rw-r--r-- | xorg-server/Xi/exevents.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c index dff0a92b0..9d8416b4a 100644 --- a/xorg-server/Xi/exevents.c +++ b/xorg-server/Xi/exevents.c @@ -1302,7 +1302,7 @@ RetrieveTouchDeliveryData(DeviceIntPtr dev, TouchPointInfoPtr ti, *mask = (*grab)->xi2mask; } else { - rc = dixLookupResourceByType((pointer *) win, listener->listener, + rc = dixLookupResourceByType((void **) win, listener->listener, listener->resource_type, serverClient, DixSendAccess); if (rc != Success) @@ -1735,7 +1735,7 @@ ProcessDeviceEvent(InternalEvent *ev, DeviceIntPtr device) eventinfo.device = device; eventinfo.event = ev; - CallCallbacks(&DeviceEventCallback, (pointer) &eventinfo); + CallCallbacks(&DeviceEventCallback, (void *) &eventinfo); } grab = device->deviceGrab.grab; @@ -2204,7 +2204,7 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device, if (param->cursor == None) cursor = NullCursor; else { - rc = dixLookupResourceByType((pointer *) &cursor, param->cursor, + rc = dixLookupResourceByType((void **) &cursor, param->cursor, RT_CURSOR, client, DixUseAccess); if (rc != Success) { client->errorValue = param->cursor; @@ -2303,7 +2303,7 @@ GrabWindow(ClientPtr client, DeviceIntPtr dev, int type, if (param->cursor == None) cursor = NullCursor; else { - rc = dixLookupResourceByType((pointer *) &cursor, param->cursor, + rc = dixLookupResourceByType((void **) &cursor, param->cursor, RT_CURSOR, client, DixUseAccess); if (rc != Success) { client->errorValue = param->cursor; @@ -2446,7 +2446,7 @@ AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx) others->resource = FakeClientID(client->index); others->next = pWin->optional->inputMasks->inputClients; pWin->optional->inputMasks->inputClients = others; - if (!AddResource(others->resource, RT_INPUTCLIENT, (pointer) pWin)) + if (!AddResource(others->resource, RT_INPUTCLIENT, (void *) pWin)) goto bail; return Success; @@ -2548,7 +2548,7 @@ InputClientGone(WindowPtr pWin, XID id) else { other->resource = FakeClientID(0); if (!AddResource(other->resource, RT_INPUTCLIENT, - (pointer) pWin)) + (void *) pWin)) return BadAlloc; } } |