diff options
author | Keith Packard <keithp@keithp.com> | 2015-06-22 09:36:08 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 12:54:40 +0100 |
commit | 68dd0b52e13c844d662192654fb10cb993257a59 (patch) | |
tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/mi/miglblt.c | |
parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
download | nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.gz nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.bz2 nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.zip |
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>
Diffstat (limited to 'nx-X11/programs/Xserver/mi/miglblt.c')
-rw-r--r-- | nx-X11/programs/Xserver/mi/miglblt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/mi/miglblt.c b/nx-X11/programs/Xserver/mi/miglblt.c index 12d0aa932..3960fc212 100644 --- a/nx-X11/programs/Xserver/mi/miglblt.c +++ b/nx-X11/programs/Xserver/mi/miglblt.c @@ -90,7 +90,7 @@ miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) int x, y; unsigned int nglyph; CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ + void *pglyphBase; /* start of array of glyphs */ { int width, height; PixmapPtr pPixmap; @@ -203,7 +203,7 @@ miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) int x, y; unsigned int nglyph; CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ + void *pglyphBase; /* start of array of glyphs */ { ExtentInfoRec info; /* used by QueryGlyphExtents() */ XID gcvals[3]; |