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/os/xalloc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'nx-X11/programs/Xserver/os/xalloc.c') diff --git a/nx-X11/programs/Xserver/os/xalloc.c b/nx-X11/programs/Xserver/os/xalloc.c index e1cdbfc5b..a2487d4bc 100644 --- a/nx-X11/programs/Xserver/os/xalloc.c +++ b/nx-X11/programs/Xserver/os/xalloc.c @@ -466,10 +466,10 @@ Xalloc (unsigned long amount) * "no failure" realloc, alternate interface to Xalloc w/o Must_have_memory *****************/ -pointer +void * XNFalloc (unsigned long amount) { - register pointer ptr; + register void * ptr; /* zero size requested */ if (amount == 0) { @@ -499,10 +499,10 @@ XNFalloc (unsigned long amount) * Xcalloc *****************/ -pointer +void * Xcalloc (unsigned long amount) { - pointer ret; + void * ret; ret = Xalloc (amount); if (ret != 0 @@ -520,7 +520,7 @@ Xcalloc (unsigned long amount) void * XNFcalloc (unsigned long amount) { - pointer ret; + void * ret; ret = XNFalloc (amount); if (ret != 0 @@ -537,7 +537,7 @@ XNFcalloc (unsigned long amount) *****************/ void * -Xrealloc (pointer ptr, unsigned long amount) +Xrealloc (void * ptr, unsigned long amount) { register unsigned long *new_ptr; @@ -614,9 +614,9 @@ Xrealloc (pointer ptr, unsigned long amount) *****************/ void * -XNFrealloc (pointer ptr, unsigned long amount) +XNFrealloc (void * ptr, unsigned long amount) { - if (( ptr = (pointer)Xrealloc( ptr, amount ) ) == NULL) + if (( ptr = (void *)Xrealloc( ptr, amount ) ) == NULL) { FatalError( "Out of memory" ); } @@ -629,7 +629,7 @@ XNFrealloc (pointer ptr, unsigned long amount) *****************/ void -Xfree(pointer ptr) +Xfree(void * ptr) { unsigned long size; unsigned long *pheader; -- cgit v1.2.3