mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 05:54:08 +00:00
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>
This commit is contained in:
@@ -69,17 +69,17 @@ miDestroyPictureClip(PicturePtr pPicture)
|
||||
}
|
||||
|
||||
int
|
||||
miChangePictureClip(PicturePtr pPicture, int type, pointer value, int n)
|
||||
miChangePictureClip(PicturePtr pPicture, int type, void *value, int n)
|
||||
{
|
||||
ScreenPtr pScreen = pPicture->pDrawable->pScreen;
|
||||
PictureScreenPtr ps = GetPictureScreen(pScreen);
|
||||
pointer clientClip;
|
||||
void *clientClip;
|
||||
int clientClipType;
|
||||
|
||||
switch (type) {
|
||||
case CT_PIXMAP:
|
||||
/* convert the pixmap to a region */
|
||||
clientClip = (pointer) BitmapToRegion(pScreen, (PixmapPtr) value);
|
||||
clientClip = (void *) BitmapToRegion(pScreen, (PixmapPtr) value);
|
||||
if (!clientClip)
|
||||
return BadAlloc;
|
||||
clientClipType = CT_REGION;
|
||||
@@ -94,7 +94,7 @@ miChangePictureClip(PicturePtr pPicture, int type, pointer value, int n)
|
||||
clientClipType = CT_NONE;
|
||||
break;
|
||||
default:
|
||||
clientClip = (pointer) RegionFromRects(n, (xRectangle *) value, type);
|
||||
clientClip = (void *) RegionFromRects(n, (xRectangle *) value, type);
|
||||
if (!clientClip)
|
||||
return BadAlloc;
|
||||
clientClipType = CT_REGION;
|
||||
|
||||
Reference in New Issue
Block a user