aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi/exevents.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/Xi/exevents.c')
-rw-r--r--xorg-server/Xi/exevents.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 4e180d755..8f804087b 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -1304,7 +1304,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)
@@ -1739,7 +1739,7 @@ ProcessDeviceEvent(InternalEvent *ev, DeviceIntPtr device)
eventinfo.device = device;
eventinfo.event = ev;
- CallCallbacks(&DeviceEventCallback, (pointer) &eventinfo);
+ CallCallbacks(&DeviceEventCallback, (void *) &eventinfo);
}
grab = device->deviceGrab.grab;
@@ -2208,7 +2208,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;
@@ -2307,7 +2307,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;
@@ -2450,7 +2450,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;
@@ -2556,7 +2556,7 @@ InputClientGone(WindowPtr pWin, XID id)
else {
other->resource = FakeClientID(0);
if (!AddResource(other->resource, RT_INPUTCLIENT,
- (pointer) pWin))
+ (void *) pWin))
return BadAlloc;
}
}