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, 2 insertions, 2 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.h b/nx-X11/programs/Xserver/hw/nxagent/GCOps.h
index fa4967aee..725b382c5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.h
@@ -93,10 +93,10 @@ void nxagentImageText16(DrawablePtr pDrawable, GCPtr pGC, int x,
                             int y, int count, unsigned short *string);
 
 void nxagentImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
-                              unsigned int nGlyphs, CharInfoPtr *pCharInfo, pointer pGlyphBase);
+                              unsigned int nGlyphs, CharInfoPtr *pCharInfo, void * pGlyphBase);
 
 void nxagentPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
-                             unsigned int nGlyphs, CharInfoPtr *pCharInfo, pointer pGlyphBase);
+                             unsigned int nGlyphs, CharInfoPtr *pCharInfo, void * pGlyphBase);
 
 void nxagentPushPixels(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable,
                            int width, int height, int x, int y);