aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
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/hw/nxagent/NXrender.c
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/hw/nxagent/NXrender.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXrender.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
index e34689399..260355c6e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
@@ -125,9 +125,9 @@ void nxagentCreateGlyphSet(GlyphSetPtr glyphSet);
void nxagentReferenceGlyphSet(GlyphSetPtr glyphSet);
void nxagentFreeGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, int nglyph);
void nxagentFreeGlyphSet(GlyphSetPtr glyphSet);
-void nxagentSetPictureTransform(PicturePtr pPicture, pointer transform);
+void nxagentSetPictureTransform(PicturePtr pPicture, void * transform);
void nxagentSetPictureFilter(PicturePtr pPicture, char *filter, int name_size,
- pointer params, int nparams);
+ void * params, int nparams);
void nxagentTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat,
INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps);
@@ -334,8 +334,8 @@ typedef struct _RenderClient {
static void
RenderClientCallback (CallbackListPtr *list,
- pointer closure,
- pointer data)
+ void * closure,
+ void * data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
@@ -767,7 +767,7 @@ ProcRenderCreatePicture (ClientPtr client)
return error;
nxagentCreatePicture(pPicture, stuff -> mask);
- if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
+ if (!AddResource (stuff->pid, PictureType, (void *)pPicture))
return BadAlloc;
return Success;
}
@@ -1341,7 +1341,7 @@ ProcRenderCreateGlyphSet (ClientPtr client)
glyphSet = AllocateGlyphSet (f, format);
if (!glyphSet)
return BadAlloc;
- if (!AddResource (stuff->gsid, GlyphSetType, (pointer)glyphSet))
+ if (!AddResource (stuff->gsid, GlyphSetType, (void *)glyphSet))
return BadAlloc;
nxagentCreateGlyphSet(glyphSet);
@@ -1372,7 +1372,7 @@ ProcRenderReferenceGlyphSet (ClientPtr client)
nxagentReferenceGlyphSet(glyphSet);
- if (!AddResource (stuff->gsid, GlyphSetType, (pointer)glyphSet))
+ if (!AddResource (stuff->gsid, GlyphSetType, (void *)glyphSet))
return BadAlloc;
return client->noClientException;
}
@@ -1953,7 +1953,7 @@ ProcRenderCreateCursor (ClientPtr client)
{
(*pScreen->GetImage) (pSrc->pDrawable,
0, 0, width, height, ZPixmap,
- 0xffffffff, (pointer) argbbits);
+ 0xffffffff, (void *) argbbits);
}
else
{
@@ -1993,7 +1993,7 @@ ProcRenderCreateCursor (ClientPtr client)
0, 0, 0, 0, 0, 0, width, height);
(*pScreen->GetImage) (pPicture->pDrawable,
0, 0, width, height, ZPixmap,
- 0xffffffff, (pointer) argbbits);
+ 0xffffffff, (void *) argbbits);
FreePicture (pPicture, 0);
}
/*
@@ -2120,7 +2120,7 @@ ProcRenderCreateCursor (ClientPtr client)
nxagentRenderRealizeCursor(pScreen, pCursor);
- if (AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
+ if (AddResource(stuff->cid, RT_CURSOR, (void *)pCursor))
return (client->noClientException);
return BadAlloc;
}
@@ -2324,7 +2324,7 @@ ProcRenderCreateAnimCursor (ClientPtr client)
pCursor -> devPriv[i] = NULL;
}
- if (AddResource (stuff->cid, RT_CURSOR, (pointer)pCursor))
+ if (AddResource (stuff->cid, RT_CURSOR, (void *)pCursor))
return client->noClientException;
return BadAlloc;
}
@@ -2370,7 +2370,7 @@ static int ProcRenderCreateSolidFill(ClientPtr client)
nxagentRenderCreateSolidFill(pPicture, &stuff -> color);
/* AGENT SERVER */
- if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
+ if (!AddResource (stuff->pid, PictureType, (void *)pPicture))
return BadAlloc;
return Success;
}
@@ -2407,7 +2407,7 @@ static int ProcRenderCreateLinearGradient (ClientPtr client)
stuff->nStops, stops, colors);
/* AGENT SERVER */
- if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
+ if (!AddResource (stuff->pid, PictureType, (void *)pPicture))
return BadAlloc;
return Success;
}
@@ -2445,7 +2445,7 @@ static int ProcRenderCreateRadialGradient (ClientPtr client)
stuff->nStops, stops, colors);
/* AGENT SERVER */
- if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
+ if (!AddResource (stuff->pid, PictureType, (void *)pPicture))
return BadAlloc;
return Success;
}
@@ -2481,7 +2481,7 @@ static int ProcRenderCreateConicalGradient (ClientPtr client)
colors);
/* AGENT SERVER */
- if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
+ if (!AddResource (stuff->pid, PictureType, (void *)pPicture))
return BadAlloc;
return Success;
}