aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi/mi.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-06-22 09:36:08 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 12:54:40 +0100
commit68dd0b52e13c844d662192654fb10cb993257a59 (patch)
treea97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/mi/mi.h
parente9f44221b2520a1d894b3c125269b5d10438453b (diff)
downloadnx-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/mi.h')
-rw-r--r--nx-X11/programs/Xserver/mi/mi.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/mi/mi.h b/nx-X11/programs/Xserver/mi/mi.h
index 3c85693dc..0f3f5778f 100644
--- a/nx-X11/programs/Xserver/mi/mi.h
+++ b/nx-X11/programs/Xserver/mi/mi.h
@@ -263,7 +263,7 @@ extern void miPolyGlyphBlt(
int /*y*/,
unsigned int /*nglyph*/,
CharInfoPtr * /*ppci*/,
- pointer /*pglyphBase*/
+ void * /*pglyphBase*/
);
extern void miImageGlyphBlt(
@@ -273,7 +273,7 @@ extern void miImageGlyphBlt(
int /*y*/,
unsigned int /*nglyph*/,
CharInfoPtr * /*ppci*/,
- pointer /*pglyphBase*/
+ void * /*pglyphBase*/
);
/* mipoly.c */
@@ -438,7 +438,7 @@ extern Bool miModifyPixmapHeader(
int /*depth*/,
int /*bitsPerPixel*/,
int /*devKind*/,
- pointer /*pPixData*/
+ void * /*pPixData*/
);
extern Bool miCloseScreen(
@@ -453,12 +453,12 @@ extern Bool miCreateScreenResources(
extern Bool miScreenDevPrivateInit(
ScreenPtr /*pScreen*/,
int /*width*/,
- pointer /*pbits*/
+ void * /*pbits*/
);
extern Bool miScreenInit(
ScreenPtr /*pScreen*/,
- pointer /*pbits*/,
+ void * /*pbits*/,
int /*xsize*/,
int /*ysize*/,
int /*dpix*/,