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/render/miglyph.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/render/miglyph.c')
| -rw-r--r-- | nx-X11/programs/Xserver/render/miglyph.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/render/miglyph.c b/nx-X11/programs/Xserver/render/miglyph.c index 237ec13a4..8b046bd46 100644 --- a/nx-X11/programs/Xserver/render/miglyph.c +++ b/nx-X11/programs/Xserver/render/miglyph.c @@ -168,7 +168,7 @@ miGlyphs (CARD8 op, pPixmap = GetScratchPixmapHeader (pScreen, glyph->info.width, glyph->info.height, list->format->depth, list->format->depth, - 0, (pointer) (glyph + 1)); + 0, (void *) (glyph + 1)); if (!pPixmap) return; component_alpha = NeedsComponent(list->format->format); @@ -183,7 +183,7 @@ miGlyphs (CARD8 op, } (*pScreen->ModifyPixmapHeader) (pPixmap, glyph->info.width, glyph->info.height, - 0, 0, -1, (pointer) (glyph + 1)); + 0, 0, -1, (void *) (glyph + 1)); pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; if (maskFormat) { @@ -219,7 +219,7 @@ miGlyphs (CARD8 op, if (pPicture) { FreeScratchPixmapHeader (pPixmap); - FreePicture ((pointer) pPicture, 0); + FreePicture ((void *) pPicture, 0); pPicture = 0; pPixmap = 0; } @@ -237,7 +237,7 @@ miGlyphs (CARD8 op, 0, 0, x, y, width, height); - FreePicture ((pointer) pMask, (XID) 0); + FreePicture ((void *) pMask, (XID) 0); (*pScreen->DestroyPixmap) (pMaskPixmap); } } |