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/Xext/xf86miscproc.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'nx-X11/programs/Xserver/Xext/xf86miscproc.h') diff --git a/nx-X11/programs/Xserver/Xext/xf86miscproc.h b/nx-X11/programs/Xserver/Xext/xf86miscproc.h index 87a251767..5eefa02a3 100644 --- a/nx-X11/programs/Xserver/Xext/xf86miscproc.h +++ b/nx-X11/programs/Xserver/Xext/xf86miscproc.h @@ -50,17 +50,17 @@ typedef enum { void XFree86MiscExtensionInit(void); -Bool MiscExtGetMouseSettings(pointer *mouse, char **devname); -int MiscExtGetMouseValue(pointer mouse, MiscExtMseValType valtype); -Bool MiscExtSetMouseValue(pointer mouse, MiscExtMseValType valtype, int value); -Bool MiscExtGetKbdSettings(pointer *kbd); -int MiscExtGetKbdValue(pointer kbd, MiscExtKbdValType valtype); -Bool MiscExtSetKbdValue(pointer kbd, MiscExtKbdValType valtype, int value); +Bool MiscExtGetMouseSettings(void **mouse, char **devname); +int MiscExtGetMouseValue(void * mouse, MiscExtMseValType valtype); +Bool MiscExtSetMouseValue(void * mouse, MiscExtMseValType valtype, int value); +Bool MiscExtGetKbdSettings(void **kbd); +int MiscExtGetKbdValue(void * kbd, MiscExtKbdValType valtype); +Bool MiscExtSetKbdValue(void * kbd, MiscExtKbdValType valtype, int value); int MiscExtSetGrabKeysState(ClientPtr client, int enable); -pointer MiscExtCreateStruct(MiscExtStructType mse_or_kbd); -void MiscExtDestroyStruct(pointer structure, MiscExtStructType mse_or_kbd); -MiscExtReturn MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd); -Bool MiscExtSetMouseDevice(pointer mouse, char* device); +void * MiscExtCreateStruct(MiscExtStructType mse_or_kbd); +void MiscExtDestroyStruct(void * structure, MiscExtStructType mse_or_kbd); +MiscExtReturn MiscExtApply(void * structure, MiscExtStructType mse_or_kbd); +Bool MiscExtSetMouseDevice(void * mouse, char* device); Bool MiscExtGetFilePaths(const char **configfile, const char **modulepath, const char **logfile); int MiscExtPassMessage(int scrn, const char *msgtype, const char *msgval, -- cgit v1.2.3