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/XTrap/xf86XTrapModule.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c') diff --git a/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c b/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c index 1783d577a..3b9955eba 100644 --- a/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c +++ b/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c @@ -41,11 +41,11 @@ static XF86ModuleVersionInfo xtrapVersRec = XF86ModuleData xtrapModuleData = { &xtrapVersRec, xtrapSetup, NULL }; -static pointer -xtrapSetup(pointer module, pointer opts, int *errmaj, int *errmin) { +static void * +xtrapSetup(void * module, void * opts, int *errmaj, int *errmin) { LoadExtension(&xtrapExt, FALSE); /* Need a non-NULL return value to indicate success */ - return (pointer)1; + return (void *)1; } #endif /* XFree86LOADER */ -- cgit v1.2.3