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/hw/nxagent/Font.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Font.h') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.h b/nx-X11/programs/Xserver/hw/nxagent/Font.h index d3ee2b0da..873efba51 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.h @@ -65,7 +65,7 @@ int nxagentFontLookUp(const char *name); Bool nxagentFontFind(const char *name, int *pos); void nxagentListRemoteAddName(const char *name, int status); -int nxagentDestroyNewFontResourceType(pointer p, XID id); +int nxagentDestroyNewFontResourceType(void * p, XID id); Bool nxagentDisconnectAllFonts(void); Bool nxagentReconnectAllFonts(void *p0); -- cgit v1.2.3