diff options
Diffstat (limited to 'nx-X11/programs/Xserver/Xi')
-rw-r--r-- | nx-X11/programs/Xserver/Xi/devbell.c | 6 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/Xi/exevents.c | 6 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/Xi/stubs.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/Xi/devbell.c b/nx-X11/programs/Xserver/Xi/devbell.c index bdc941c1c..190e32086 100644 --- a/nx-X11/programs/Xserver/Xi/devbell.c +++ b/nx-X11/programs/Xserver/Xi/devbell.c @@ -104,7 +104,7 @@ ProcXDeviceBell (client) int base; int newpercent; CARD8 class; - pointer ctrl; + void * ctrl; BellProcPtr proc; REQUEST(xDeviceBellReq); @@ -137,7 +137,7 @@ ProcXDeviceBell (client) } base = k->ctrl.bell; proc = k->BellProc; - ctrl = (pointer) &(k->ctrl); + ctrl = (void *) &(k->ctrl); class = KbdFeedbackClass; } else if (stuff->feedbackclass == BellFeedbackClass) @@ -153,7 +153,7 @@ ProcXDeviceBell (client) } base = b->ctrl.percent; proc = b->BellProc; - ctrl = (pointer) &(b->ctrl); + ctrl = (void *) &(b->ctrl); class = BellFeedbackClass; } else diff --git a/nx-X11/programs/Xserver/Xi/exevents.c b/nx-X11/programs/Xserver/Xi/exevents.c index 99fbb129a..f0c9aea3d 100644 --- a/nx-X11/programs/Xserver/Xi/exevents.c +++ b/nx-X11/programs/Xserver/Xi/exevents.c @@ -143,7 +143,7 @@ ProcessOtherEvent (xE, other, count) DeviceEventInfoRec eventinfo; eventinfo.events = (xEventPtr) xE; eventinfo.count = count; - CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo); + CallCallbacks(&DeviceEventCallback, (void *)&eventinfo); } for (i=1; i<count; i++) if ((++xV)->type == DeviceValuator) @@ -751,7 +751,7 @@ AddExtensionClient (pWin, client, mask, 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)) return BadAlloc; return Success; } @@ -846,7 +846,7 @@ InputClientGone(pWin, id) { other->resource = FakeClientID(0); if (!AddResource(other->resource, RT_INPUTCLIENT, - (pointer)pWin)) + (void *)pWin)) return BadAlloc; } } diff --git a/nx-X11/programs/Xserver/Xi/stubs.c b/nx-X11/programs/Xserver/Xi/stubs.c index 7ad6d903e..2d9aad08b 100644 --- a/nx-X11/programs/Xserver/Xi/stubs.c +++ b/nx-X11/programs/Xserver/Xi/stubs.c @@ -209,7 +209,7 @@ AddOtherInputDevices () DeviceIntPtr dev; DeviceProc deviceProc; - pointer private; + void * private; dev = (DeviceIntPtr) AddInputDevice(deviceProc, TRUE); dev->public.devicePrivate = private; |