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/xkbEvents.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/xkbEvents.c')
-rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbEvents.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbEvents.c b/nx-X11/programs/Xserver/xkb/xkbEvents.c index 914e3e782..ca201c6f0 100644 --- a/nx-X11/programs/Xserver/xkb/xkbEvents.c +++ b/nx-X11/programs/Xserver/xkb/xkbEvents.c @@ -383,7 +383,7 @@ XkbHandleBell( BOOL force, BOOL eventOnly, DeviceIntPtr kbd, CARD8 percent, - pointer pCtrl, + void * pCtrl, CARD8 class, Atom name, WindowPtr pWin, @@ -402,7 +402,7 @@ XID winID = 0; if ((force||(xkbi->desc->ctrls->enabled_ctrls&XkbAudibleBellMask))&& (!eventOnly)) { - (*kbd->kbdfeed->BellProc)(percent,kbd,(pointer)pCtrl,class); + (*kbd->kbdfeed->BellProc)(percent,kbd,(void *)pCtrl,class); } interest = kbd->xkb_interest; if ((!interest)||(force)) @@ -822,7 +822,7 @@ XkbSrvInfoPtr xkbi; ErrorF(" Event state= 0x%04x\n",xE[0].u.keyButtonPointer.state); ErrorF(" XkbLastRepeatEvent!=xE (0x%x!=0x%x) %s\n", XkbLastRepeatEvent,xE, - ((XkbLastRepeatEvent!=(pointer)xE)?"True":"False")); + ((XkbLastRepeatEvent!=(void *)xE)?"True":"False")); ErrorF(" (xkbClientEventsFlags&XWDA)==0 (0x%x) %s\n", pClient->xkbClientFlags, (_XkbWantsDetectableAutoRepeat(pClient)?"True":"False")); @@ -830,7 +830,7 @@ XkbSrvInfoPtr xkbi; (!_XkbIsReleaseEvent(xE[0].u.u.type))?"True":"False"); } #endif /* DEBUG */ - if ( (XkbLastRepeatEvent==(pointer)xE) && + if ( (XkbLastRepeatEvent==(void *)xE) && (_XkbWantsDetectableAutoRepeat(pClient)) && (_XkbIsReleaseEvent(xE[0].u.u.type)) ) { return False; |