summaryrefslogtreecommitdiff
path: root/hw/xquartz/xpr/driWrap.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-12-15 01:05:51 -0800
committerKeith Packard <keithp@keithp.com>2014-01-12 10:24:11 -0800
commit60014a4a98ff924ae7f6840781f768c1cc93bbab (patch)
treea956a03a6a7c87cac4d48fb95b66fec313d87fde /hw/xquartz/xpr/driWrap.c
parent93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce (diff)
downloadxserver-60014a4a98ff924ae7f6840781f768c1cc93bbab.tar.gz
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>
Diffstat (limited to 'hw/xquartz/xpr/driWrap.c')
-rw-r--r--hw/xquartz/xpr/driWrap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xquartz/xpr/driWrap.c b/hw/xquartz/xpr/driWrap.c
index 5f9f3abd3..42282d52b 100644
--- a/hw/xquartz/xpr/driWrap.c
+++ b/hw/xquartz/xpr/driWrap.c
@@ -447,7 +447,7 @@ DRIImageText16(DrawablePtr dst, GCPtr pGC,
static void
DRIImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
int x, int y, unsigned int nglyphInit,
- CharInfoPtr *ppciInit, pointer unused)
+ CharInfoPtr *ppciInit, void *unused)
{
DRISavedDrawableState saved;
@@ -465,7 +465,7 @@ DRIImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
static void
DRIPolyGlyphBlt(DrawablePtr dst, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr *ppci, pointer pglyphBase)
+ CharInfoPtr *ppci, void *pglyphBase)
{
DRISavedDrawableState saved;