summaryrefslogtreecommitdiff
path: root/Xi/devbell.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-12-15 01:05:51 -0800
committerKeith Packard <keithp@keithp.com>2014-01-12 10:24:11 -0800
commit60014a4a98ff924ae7f6840781f768c1cc93bbab (patch)
treea956a03a6a7c87cac4d48fb95b66fec313d87fde /Xi/devbell.c
parent93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce (diff)
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 <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'Xi/devbell.c')
-rw-r--r--Xi/devbell.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Xi/devbell.c b/Xi/devbell.c
index 202c8de18..07865d270 100644
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@@ -91,7 +91,7 @@ ProcXDeviceBell(ClientPtr client)
int rc, base;
int newpercent;
CARD8 class;
- pointer ctrl;
+ void *ctrl;
BellProcPtr proc;
REQUEST(xDeviceBellReq);
@@ -117,7 +117,7 @@ ProcXDeviceBell(ClientPtr client)
}
base = k->ctrl.bell;
proc = k->BellProc;
- ctrl = (pointer) &(k->ctrl);
+ ctrl = (void *) &(k->ctrl);
class = KbdFeedbackClass;
}
else if (stuff->feedbackclass == BellFeedbackClass) {
@@ -130,7 +130,7 @@ ProcXDeviceBell(ClientPtr client)
}
base = b->ctrl.percent;
proc = b->BellProc;
- ctrl = (pointer) &(b->ctrl);
+ ctrl = (void *) &(b->ctrl);
class = BellFeedbackClass;
}
else {