diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
| commit | edce25213ffc81389909c827c9aaac27b736b483 (patch) | |
| tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/xkb/xkb.c | |
| parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
| parent | 68dd0b52e13c844d662192654fb10cb993257a59 (diff) | |
| download | nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2 nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip | |
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkb.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 1e4052914..441d88a5c 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -369,7 +369,7 @@ ProcXkbBell(ClientPtr client) WindowPtr pWin; int base; int newPercent,oldPitch,oldDuration; - pointer ctrl; + void * ctrl; REQUEST_SIZE_MATCH(xkbBellReq); @@ -416,7 +416,7 @@ ProcXkbBell(ClientPtr client) return BadValue; } base = k->ctrl.bell; - ctrl = (pointer) &(k->ctrl); + ctrl = (void *) &(k->ctrl); oldPitch= k->ctrl.bell_pitch; oldDuration= k->ctrl.bell_duration; if (stuff->pitch!=0) { @@ -445,7 +445,7 @@ ProcXkbBell(ClientPtr client) return BadValue; } base = b->ctrl.percent; - ctrl = (pointer) &(b->ctrl); + ctrl = (void *) &(b->ctrl); oldPitch= b->ctrl.pitch; oldDuration= b->ctrl.duration; if (stuff->pitch!=0) { @@ -6241,7 +6241,7 @@ ProcXkbDispatch (ClientPtr client) } static int -XkbClientGone(pointer data,XID id) +XkbClientGone(void * data,XID id) { DevicePtr pXDev = (DevicePtr)data; |