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 <keithp@keithp.com>
 Reviewed-by: Eric Anholt <eric@anholt.net>
 Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

1 files changed, 7 insertions, 7 deletions

diff --git a/nx-X11/programs/Xserver/Xext/appgroup.c b/nx-X11/programs/Xserver/Xext/appgroup.c
index ad4afa9e4..e23ceca59 100644
--- a/nx-X11/programs/Xserver/Xext/appgroup.c
+++ b/nx-X11/programs/Xserver/Xext/appgroup.c
@@ -92,7 +92,7 @@ extern int connBlockScreenStart;
 
 static 
 int XagAppGroupFree(
-    pointer what,
+    void * what,
     XID id) /* unused */
 {
     int i;
@@ -126,8 +126,8 @@ int XagAppGroupFree(
 /* static */
 void XagClientStateChange(
     CallbackListPtr* pcbl,
-    pointer nulldata,
-    pointer calldata)
+    void * nulldata,
+    void * calldata)
 {
     SecurityAuthorizationPtr pAuth;
     NewClientInfoRec* pci = (NewClientInfoRec*) calldata;
@@ -262,7 +262,7 @@ void XagResetProc(
 {
     DeleteCallback (&ClientStateCallback, XagClientStateChange, NULL);
     XagCallbackRefCount = 0;
-    while (appGrpList) XagAppGroupFree ((pointer) appGrpList, 0);
+    while (appGrpList) XagAppGroupFree ((void *) appGrpList, 0);
 }
 
 static 
@@ -476,7 +476,7 @@ int ProcXagCreate (
 	return BadAlloc;
     ret = AttrValidate (client, stuff->attrib_mask, pAppGrp);
     if (ret != Success) {
-	XagAppGroupFree ((pointer)pAppGrp, (XID)0);
+	XagAppGroupFree ((void *)pAppGrp, (XID)0);
 	return ret;
     }
     if (pAppGrp->single_screen) {
@@ -484,7 +484,7 @@ int ProcXagCreate (
 	if (!pAppGrp->ConnectionInfo)
 	    return BadAlloc;
     }
-    if (!AddResource (stuff->app_group, RT_APPGROUP, (pointer)pAppGrp))
+    if (!AddResource (stuff->app_group, RT_APPGROUP, (void *)pAppGrp))
 	return BadAlloc;
     if (XagCallbackRefCount++ == 0)
 	(void) AddCallback (&ClientStateCallback, XagClientStateChange, NULL);
@@ -824,6 +824,6 @@ void XagCallClientStateChange(
 	NewClientInfoRec clientinfo;
 
 	clientinfo.client = client;
-	XagClientStateChange (NULL, NULL, (pointer)&clientinfo);
+	XagClientStateChange (NULL, NULL, (void *)&clientinfo);
     }
 }