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/xkbInit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/xkb/xkbInit.c') diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index a338de8ad..ef7e6a4f7 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -168,7 +168,7 @@ XkbGetRulesDflts(XkbRF_VarDefsPtr defs) } Bool -XkbWriteRulesProp(ClientPtr client, pointer closure) +XkbWriteRulesProp(ClientPtr client, void * closure) { int len,out; Atom name; @@ -296,7 +296,7 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout, #include "xkbDflts.h" /* A dummy to keep the compiler quiet */ -pointer xkbBogus = &indicators; +void * xkbBogus = &indicators; static Bool XkbInitKeyTypes(XkbDescPtr xkb,SrvXkmInfo *file) @@ -619,7 +619,7 @@ XkbInitKeyboardDeviceStruct( void (*bellProc)( int /*percent*/, DeviceIntPtr /*device*/, - pointer /*ctrl*/, + void * /*ctrl*/, int), void (*ctrlProc)( DeviceIntPtr /*device*/, -- cgit v1.2.3