From 68dd0b52e13c844d662192654fb10cb993257a59 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 22 Jun 2015 09:36:08 +0200 Subject: Replace 'pointer' type with 'void *' This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer' is used throughout the X server for other things, and having duplicate names generates compiler warnings. Signed-off-by: Keith Packard Reviewed-by: Eric Anholt Rebased against NX: Mike Gabriel --- nx-X11/programs/Xserver/xkb/ddxBeep.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/xkb/ddxBeep.c') diff --git a/nx-X11/programs/Xserver/xkb/ddxBeep.c b/nx-X11/programs/Xserver/xkb/ddxBeep.c index 429d1e778..22d62a502 100644 --- a/nx-X11/programs/Xserver/xkb/ddxBeep.c +++ b/nx-X11/programs/Xserver/xkb/ddxBeep.c @@ -148,7 +148,7 @@ _XkbDDXBeepInitAtoms(void) } static CARD32 -_XkbDDXBeepExpire(OsTimerPtr timer,CARD32 now,pointer arg) +_XkbDDXBeepExpire(OsTimerPtr timer,CARD32 now,void * arg) { DeviceIntPtr dev= (DeviceIntPtr)arg; KbdFeedbackPtr feed; @@ -322,11 +322,11 @@ Atom name; ctrl->bell_duration= duration; ctrl->bell_pitch= pitch; if (xkbInfo->beepCount==0) { - XkbHandleBell(0,0,dev,ctrl->bell,(pointer)ctrl,KbdFeedbackClass,name,None, + XkbHandleBell(0,0,dev,ctrl->bell,(void *)ctrl,KbdFeedbackClass,name,None, NULL); } else if (xkbInfo->desc->ctrls->enabled_ctrls&XkbAudibleBellMask) { - (*dev->kbdfeed->BellProc)(ctrl->bell,dev,(pointer)ctrl,KbdFeedbackClass); + (*dev->kbdfeed->BellProc)(ctrl->bell,dev,(void *)ctrl,KbdFeedbackClass); } ctrl->bell_duration= oldDuration; ctrl->bell_pitch= oldPitch; @@ -360,11 +360,11 @@ CARD32 next; xkbInfo->beepType= what; xkbInfo->beepCount= 0; - next= _XkbDDXBeepExpire(NULL,0,(pointer)dev); + next= _XkbDDXBeepExpire(NULL,0,(void *)dev); if (next>0) { xkbInfo->beepTimer= TimerSet(xkbInfo->beepTimer, 0, next, - _XkbDDXBeepExpire, (pointer)dev); + _XkbDDXBeepExpire, (void *)dev); } return 1; } -- cgit v1.2.3