aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/render
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/render')
-rw-r--r--xorg-server/render/animcur.c2
-rw-r--r--xorg-server/render/glyph.c8
-rw-r--r--xorg-server/render/glyphstr.h2
-rw-r--r--xorg-server/render/mipict.c8
-rw-r--r--xorg-server/render/mipict.h2
-rw-r--r--xorg-server/render/mirect.c2
-rw-r--r--xorg-server/render/picture.c28
-rw-r--r--xorg-server/render/picturestr.h10
-rw-r--r--xorg-server/render/render.c62
9 files changed, 62 insertions, 62 deletions
diff --git a/xorg-server/render/animcur.c b/xorg-server/render/animcur.c
index 038c5b9be..69f9f887c 100644
--- a/xorg-server/render/animcur.c
+++ b/xorg-server/render/animcur.c
@@ -136,7 +136,7 @@ AnimCurCursorLimits(DeviceIntPtr pDev,
static void
AnimCurScreenBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadmask)
+ void *pTimeout, void *pReadmask)
{
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
DeviceIntPtr dev;
diff --git a/xorg-server/render/glyph.c b/xorg-server/render/glyph.c
index e1dc66291..ae3812171 100644
--- a/xorg-server/render/glyph.c
+++ b/xorg-server/render/glyph.c
@@ -97,7 +97,7 @@ GlyphUninit(ScreenPtr pScreen)
glyph = globalGlyphs[fdepth].table[i].glyph;
if (glyph && glyph != DeletedGlyph) {
if (GetGlyphPicture(glyph, pScreen)) {
- FreePicture((pointer) GetGlyphPicture(glyph, pScreen), 0);
+ FreePicture((void *) GetGlyphPicture(glyph, pScreen), 0);
SetGlyphPicture(glyph, pScreen, NULL);
}
(*ps->UnrealizeGlyph) (pScreen, glyph);
@@ -237,7 +237,7 @@ FreeGlyphPicture(GlyphPtr glyph)
ScreenPtr pScreen = screenInfo.screens[i];
if (GetGlyphPicture(glyph, pScreen))
- FreePicture((pointer) GetGlyphPicture(glyph, pScreen), 0);
+ FreePicture((void *) GetGlyphPicture(glyph, pScreen), 0);
ps = GetPictureScreenIfSet(pScreen);
if (ps)
@@ -467,7 +467,7 @@ AllocateGlyphSet(int fdepth, PictFormatPtr format)
}
int
-FreeGlyphSet(pointer value, XID gid)
+FreeGlyphSet(void *value, XID gid)
{
GlyphSetPtr glyphSet = (GlyphSetPtr) value;
@@ -678,7 +678,7 @@ miGlyphs(CARD8 op,
pDst,
xSrc + x - xDst,
ySrc + y - yDst, 0, 0, x, y, width, height);
- FreePicture((pointer) pMask, (XID) 0);
+ FreePicture((void *) pMask, (XID) 0);
(*pScreen->DestroyPixmap) (pMaskPixmap);
}
}
diff --git a/xorg-server/render/glyphstr.h b/xorg-server/render/glyphstr.h
index 7d178be01..835c1a74e 100644
--- a/xorg-server/render/glyphstr.h
+++ b/xorg-server/render/glyphstr.h
@@ -131,7 +131,7 @@ extern _X_EXPORT Bool
extern _X_EXPORT GlyphSetPtr AllocateGlyphSet(int fdepth, PictFormatPtr format);
extern _X_EXPORT int
- FreeGlyphSet(pointer value, XID gid);
+ FreeGlyphSet(void *value, XID gid);
#define GLYPH_HAS_GLYPH_PICTURE_ACCESSOR 1 /* used for api compat */
extern _X_EXPORT PicturePtr
diff --git a/xorg-server/render/mipict.c b/xorg-server/render/mipict.c
index 2e64b20ff..3959fc415 100644
--- a/xorg-server/render/mipict.c
+++ b/xorg-server/render/mipict.c
@@ -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;
diff --git a/xorg-server/render/mipict.h b/xorg-server/render/mipict.h
index 943622888..a16dd3112 100644
--- a/xorg-server/render/mipict.h
+++ b/xorg-server/render/mipict.h
@@ -57,7 +57,7 @@ extern _X_EXPORT void
miDestroyPictureClip(PicturePtr pPicture);
extern _X_EXPORT int
- miChangePictureClip(PicturePtr pPicture, int type, pointer value, int n);
+ miChangePictureClip(PicturePtr pPicture, int type, void *value, int n);
extern _X_EXPORT void
miChangePicture(PicturePtr pPicture, Mask mask);
diff --git a/xorg-server/render/mirect.c b/xorg-server/render/mirect.c
index 357d52860..4e76972d1 100644
--- a/xorg-server/render/mirect.c
+++ b/xorg-server/render/mirect.c
@@ -156,7 +156,7 @@ miCompositeRects(CARD8 op,
rects++;
}
- FreePicture((pointer) pSrc, 0);
+ FreePicture((void *) pSrc, 0);
bail4:
FreeScratchGC(pGC);
bail3:
diff --git a/xorg-server/render/picture.c b/xorg-server/render/picture.c
index 2908b7629..7da93102b 100644
--- a/xorg-server/render/picture.c
+++ b/xorg-server/render/picture.c
@@ -70,7 +70,7 @@ PictureDestroyWindow(WindowPtr pWindow)
SetPictureWindow(pWindow, pPicture->pNext);
if (pPicture->id)
FreeResource(pPicture->id, PictureType);
- FreePicture((pointer) pPicture, pPicture->id);
+ FreePicture((void *) pPicture, pPicture->id);
}
pScreen->DestroyWindow = ps->DestroyWindow;
ret = (*pScreen->DestroyWindow) (pWindow);
@@ -445,7 +445,7 @@ PictureInitIndexedFormat(ScreenPtr pScreen, PictFormatPtr format)
return TRUE;
if (format->index.vid == pScreen->rootVisual) {
- dixLookupResourceByType((pointer *) &format->index.pColormap,
+ dixLookupResourceByType((void **) &format->index.pColormap,
pScreen->defColormap, RT_COLORMAP,
serverClient, DixGetAttrAccess);
}
@@ -601,7 +601,7 @@ PictureParseCmapPolicy(const char *name)
/** @see GetDefaultBytes */
static void
-GetPictureBytes(pointer value, XID id, ResourceSizePtr size)
+GetPictureBytes(void *value, XID id, ResourceSizePtr size)
{
PicturePtr picture = value;
@@ -655,7 +655,7 @@ PictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
}
for (n = 0; n < nformats; n++) {
if (!AddResource
- (formats[n].id, PictFormatType, (pointer) (formats + n))) {
+ (formats[n].id, PictFormatType, (void *) (formats + n))) {
free(formats);
return FALSE;
}
@@ -1054,7 +1054,7 @@ ChangePicture(PicturePtr pPicture,
if (pid == None)
pAlpha = 0;
else {
- error = dixLookupResourceByType((pointer *) &pAlpha, pid,
+ error = dixLookupResourceByType((void **) &pAlpha, pid,
PictureType, client,
DixReadAccess);
if (error != Success) {
@@ -1075,7 +1075,7 @@ ChangePicture(PicturePtr pPicture,
if (pAlpha && pAlpha->pDrawable->type == DRAWABLE_PIXMAP)
pAlpha->refcnt++;
if (pPicture->alphaMap)
- FreePicture((pointer) pPicture->alphaMap, (XID) 0);
+ FreePicture((void *) pPicture->alphaMap, (XID) 0);
pPicture->alphaMap = pAlpha;
}
}
@@ -1113,7 +1113,7 @@ ChangePicture(PicturePtr pPicture,
}
else {
clipType = CT_PIXMAP;
- error = dixLookupResourceByType((pointer *) &pPixmap, pid,
+ error = dixLookupResourceByType((void **) &pPixmap, pid,
RT_PIXMAP, client,
DixReadAccess);
if (error != Success) {
@@ -1143,7 +1143,7 @@ ChangePicture(PicturePtr pPicture,
}
}
error = (*ps->ChangePictureClip) (pPicture, clipType,
- (pointer) pPixmap, 0);
+ (void *) pPixmap, 0);
break;
}
case CPGraphicsExposure:
@@ -1240,7 +1240,7 @@ SetPictureClipRects(PicturePtr pPicture,
if (!clientClip)
return BadAlloc;
result = (*ps->ChangePictureClip) (pPicture, CT_REGION,
- (pointer) clientClip, 0);
+ (void *) clientClip, 0);
if (result == Success) {
pPicture->clipOrigin.x = xOrigin;
pPicture->clipOrigin.y = yOrigin;
@@ -1276,7 +1276,7 @@ SetPictureClipRegion(PicturePtr pPicture,
clientClip = 0;
}
- result = (*ps->ChangePictureClip) (pPicture, type, (pointer) clientClip, 0);
+ result = (*ps->ChangePictureClip) (pPicture, type, (void *) clientClip, 0);
if (result == Success) {
pPicture->clipOrigin.x = xOrigin;
pPicture->clipOrigin.y = yOrigin;
@@ -1354,7 +1354,7 @@ CopyPicture(PicturePtr pSrc, Mask mask, PicturePtr pDst)
pSrc->alphaMap->pDrawable->type == DRAWABLE_PIXMAP)
pSrc->alphaMap->refcnt++;
if (pDst->alphaMap)
- FreePicture((pointer) pDst->alphaMap, (XID) 0);
+ FreePicture((void *) pDst->alphaMap, (XID) 0);
pDst->alphaMap = pSrc->alphaMap;
break;
case CPAlphaXOrigin:
@@ -1435,7 +1435,7 @@ ValidatePicture(PicturePtr pPicture)
}
int
-FreePicture(pointer value, XID pid)
+FreePicture(void *value, XID pid)
{
PicturePtr pPicture = (PicturePtr) value;
@@ -1454,7 +1454,7 @@ FreePicture(pointer value, XID pid)
PictureScreenPtr ps = GetPictureScreen(pScreen);
if (pPicture->alphaMap)
- FreePicture((pointer) pPicture->alphaMap, (XID) 0);
+ FreePicture((void *) pPicture->alphaMap, (XID) 0);
(*ps->DestroyPicture) (pPicture);
(*ps->DestroyPictureClip) (pPicture);
if (pPicture->pDrawable->type == DRAWABLE_WINDOW) {
@@ -1480,7 +1480,7 @@ FreePicture(pointer value, XID pid)
}
int
-FreePictFormat(pointer pPictFormat, XID pid)
+FreePictFormat(void *pPictFormat, XID pid)
{
return Success;
}
diff --git a/xorg-server/render/picturestr.h b/xorg-server/render/picturestr.h
index 5644f28cf..8c8100d81 100644
--- a/xorg-server/render/picturestr.h
+++ b/xorg-server/render/picturestr.h
@@ -145,7 +145,7 @@ typedef struct _Picture {
DDXPointRec alphaOrigin;
DDXPointRec clipOrigin;
- pointer clientClip;
+ void *clientClip;
unsigned long serialNumber;
@@ -189,7 +189,7 @@ typedef struct {
typedef int (*CreatePictureProcPtr) (PicturePtr pPicture);
typedef void (*DestroyPictureProcPtr) (PicturePtr pPicture);
typedef int (*ChangePictureClipProcPtr) (PicturePtr pPicture,
- int clipType, pointer value, int n);
+ int clipType, void *value, int n);
typedef void (*DestroyPictureClipProcPtr) (PicturePtr pPicture);
typedef int (*ChangePictureTransformProcPtr) (PicturePtr pPicture,
@@ -363,7 +363,7 @@ extern _X_EXPORT RESTYPE GlyphSetType;
#define SetPictureWindow(w,p) dixSetPrivate(&(w)->devPrivates, PictureWindowPrivateKey, p)
#define VERIFY_PICTURE(pPicture, pid, client, mode) {\
- int tmprc = dixLookupResourceByType((pointer)&(pPicture), pid,\
+ int tmprc = dixLookupResourceByType((void *)&(pPicture), pid,\
PictureType, client, mode);\
if (tmprc != Success)\
return tmprc;\
@@ -482,10 +482,10 @@ extern _X_EXPORT void
ValidatePicture(PicturePtr pPicture);
extern _X_EXPORT int
- FreePicture(pointer pPicture, XID pid);
+ FreePicture(void *pPicture, XID pid);
extern _X_EXPORT int
- FreePictFormat(pointer pPictFormat, XID pid);
+ FreePictFormat(void *pPictFormat, XID pid);
extern _X_EXPORT void
diff --git a/xorg-server/render/render.c b/xorg-server/render/render.c
index 51f75ae7e..3b7151a69 100644
--- a/xorg-server/render/render.c
+++ b/xorg-server/render/render.c
@@ -220,7 +220,7 @@ typedef struct _RenderClient {
#define GetRenderClient(pClient) ((RenderClientPtr)dixLookupPrivate(&(pClient)->devPrivates, RenderClientPrivateKey))
static void
-RenderClientCallback(CallbackListPtr *list, pointer closure, pointer data)
+RenderClientCallback(CallbackListPtr *list, void *closure, void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
@@ -520,7 +520,7 @@ ProcRenderQueryPictIndexValues(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xRenderQueryPictIndexValuesReq);
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->format,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->format,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -587,7 +587,7 @@ ProcRenderCreatePicture(ClientPtr client)
if (rc != Success)
return rc;
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->format,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->format,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -604,7 +604,7 @@ ProcRenderCreatePicture(ClientPtr client)
stuff->mask, (XID *) (stuff + 1), client, &error);
if (!pPicture)
return error;
- if (!AddResource(stuff->pid, PictureType, (pointer) pPicture))
+ if (!AddResource(stuff->pid, PictureType, (void *) pPicture))
return BadAlloc;
return Success;
}
@@ -744,7 +744,7 @@ ProcRenderTrapezoids(ClientPtr client)
if (pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen)
return BadMatch;
if (stuff->maskFormat) {
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->maskFormat,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->maskFormat,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -783,7 +783,7 @@ ProcRenderTriangles(ClientPtr client)
if (pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen)
return BadMatch;
if (stuff->maskFormat) {
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->maskFormat,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->maskFormat,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -822,7 +822,7 @@ ProcRenderTriStrip(ClientPtr client)
if (pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen)
return BadMatch;
if (stuff->maskFormat) {
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->maskFormat,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->maskFormat,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -861,7 +861,7 @@ ProcRenderTriFan(ClientPtr client)
if (pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen)
return BadMatch;
if (stuff->maskFormat) {
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->maskFormat,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->maskFormat,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -909,7 +909,7 @@ ProcRenderCreateGlyphSet(ClientPtr client)
REQUEST_SIZE_MATCH(xRenderCreateGlyphSetReq);
LEGAL_NEW_RESOURCE(stuff->gsid, client);
- rc = dixLookupResourceByType((pointer *) &format, stuff->format,
+ rc = dixLookupResourceByType((void **) &format, stuff->format,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -943,7 +943,7 @@ ProcRenderCreateGlyphSet(ClientPtr client)
glyphSet, RT_NONE, NULL, DixCreateAccess);
if (rc != Success)
return rc;
- if (!AddResource(stuff->gsid, GlyphSetType, (pointer) glyphSet))
+ if (!AddResource(stuff->gsid, GlyphSetType, (void *) glyphSet))
return BadAlloc;
return Success;
}
@@ -960,14 +960,14 @@ ProcRenderReferenceGlyphSet(ClientPtr client)
LEGAL_NEW_RESOURCE(stuff->gsid, client);
- rc = dixLookupResourceByType((pointer *) &glyphSet, stuff->existing,
+ rc = dixLookupResourceByType((void **) &glyphSet, stuff->existing,
GlyphSetType, client, DixGetAttrAccess);
if (rc != Success) {
client->errorValue = stuff->existing;
return rc;
}
glyphSet->refcnt++;
- if (!AddResource(stuff->gsid, GlyphSetType, (pointer) glyphSet))
+ if (!AddResource(stuff->gsid, GlyphSetType, (void *) glyphSet))
return BadAlloc;
return Success;
}
@@ -984,7 +984,7 @@ ProcRenderFreeGlyphSet(ClientPtr client)
REQUEST(xRenderFreeGlyphSetReq);
REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq);
- rc = dixLookupResourceByType((pointer *) &glyphSet, stuff->glyphset,
+ rc = dixLookupResourceByType((void **) &glyphSet, stuff->glyphset,
GlyphSetType, client, DixDestroyAccess);
if (rc != Success) {
client->errorValue = stuff->glyphset;
@@ -1024,7 +1024,7 @@ ProcRenderAddGlyphs(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xRenderAddGlyphsReq);
err =
- dixLookupResourceByType((pointer *) &glyphSet, stuff->glyphset,
+ dixLookupResourceByType((void **) &glyphSet, stuff->glyphset,
GlyphSetType, client, DixAddAccess);
if (err != Success) {
client->errorValue = stuff->glyphset;
@@ -1157,7 +1157,7 @@ ProcRenderAddGlyphs(ClientPtr client)
pSrc,
None, pDst, 0, 0, 0, 0, 0, 0, width, height);
- FreePicture((pointer) pSrc, 0);
+ FreePicture((void *) pSrc, 0);
pSrc = NULL;
FreeScratchPixmapHeader(pSrcPix);
pSrcPix = NULL;
@@ -1189,7 +1189,7 @@ ProcRenderAddGlyphs(ClientPtr client)
return Success;
bail:
if (pSrc)
- FreePicture((pointer) pSrc, 0);
+ FreePicture((void *) pSrc, 0);
if (pSrcPix)
FreeScratchPixmapHeader(pSrcPix);
for (i = 0; i < nglyphs; i++)
@@ -1216,7 +1216,7 @@ ProcRenderFreeGlyphs(ClientPtr client)
CARD32 glyph;
REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
- rc = dixLookupResourceByType((pointer *) &glyphSet, stuff->glyphset,
+ rc = dixLookupResourceByType((void **) &glyphSet, stuff->glyphset,
GlyphSetType, client, DixRemoveAccess);
if (rc != Success) {
client->errorValue = stuff->glyphset;
@@ -1282,7 +1282,7 @@ ProcRenderCompositeGlyphs(ClientPtr client)
if (pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen)
return BadMatch;
if (stuff->maskFormat) {
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->maskFormat,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->maskFormat,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -1290,7 +1290,7 @@ ProcRenderCompositeGlyphs(ClientPtr client)
else
pFormat = 0;
- rc = dixLookupResourceByType((pointer *) &glyphSet, stuff->glyphset,
+ rc = dixLookupResourceByType((void **) &glyphSet, stuff->glyphset,
GlyphSetType, client, DixUseAccess);
if (rc != Success)
return rc;
@@ -1341,7 +1341,7 @@ ProcRenderCompositeGlyphs(ClientPtr client)
if (elt->len == 0xff) {
if (buffer + sizeof(GlyphSet) < end) {
memcpy(&gs, buffer, sizeof(GlyphSet));
- rc = dixLookupResourceByType((pointer *) &glyphSet, gs,
+ rc = dixLookupResourceByType((void **) &glyphSet, gs,
GlyphSetType, client,
DixUseAccess);
if (rc != Success)
@@ -1508,7 +1508,7 @@ ProcRenderCreateCursor(ClientPtr client)
if (pSrc->format == PICT_a8r8g8b8) {
(*pScreen->GetImage) (pSrc->pDrawable,
0, 0, width, height, ZPixmap,
- 0xffffffff, (pointer) argbbits);
+ 0xffffffff, (void *) argbbits);
}
else {
PixmapPtr pPixmap;
@@ -1544,7 +1544,7 @@ ProcRenderCreateCursor(ClientPtr client)
pSrc, 0, pPicture, 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);
}
/*
@@ -1633,7 +1633,7 @@ ProcRenderCreateCursor(ClientPtr client)
&pCursor, client, stuff->cid);
if (rc != Success)
goto bail;
- if (!AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor)) {
+ if (!AddResource(stuff->cid, RT_CURSOR, (void *) pCursor)) {
rc = BadAlloc;
goto bail;
}
@@ -1799,7 +1799,7 @@ ProcRenderCreateAnimCursor(ClientPtr client)
deltas = (CARD32 *) (cursors + ncursor);
elt = (xAnimCursorElt *) (stuff + 1);
for (i = 0; i < ncursor; i++) {
- ret = dixLookupResourceByType((pointer *) (cursors + i), elt->cursor,
+ ret = dixLookupResourceByType((void **) (cursors + i), elt->cursor,
RT_CURSOR, client, DixReadAccess);
if (ret != Success) {
free(cursors);
@@ -1814,7 +1814,7 @@ ProcRenderCreateAnimCursor(ClientPtr client)
if (ret != Success)
return ret;
- if (AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor))
+ if (AddResource(stuff->cid, RT_CURSOR, (void *) pCursor))
return Success;
return BadAlloc;
}
@@ -1861,7 +1861,7 @@ ProcRenderCreateSolidFill(ClientPtr client)
pPicture, RT_NONE, NULL, DixCreateAccess);
if (error != Success)
return error;
- if (!AddResource(stuff->pid, PictureType, (pointer) pPicture))
+ if (!AddResource(stuff->pid, PictureType, (void *) pPicture))
return BadAlloc;
return Success;
}
@@ -1900,7 +1900,7 @@ ProcRenderCreateLinearGradient(ClientPtr client)
pPicture, RT_NONE, NULL, DixCreateAccess);
if (error != Success)
return error;
- if (!AddResource(stuff->pid, PictureType, (pointer) pPicture))
+ if (!AddResource(stuff->pid, PictureType, (void *) pPicture))
return BadAlloc;
return Success;
}
@@ -1938,7 +1938,7 @@ ProcRenderCreateRadialGradient(ClientPtr client)
pPicture, RT_NONE, NULL, DixCreateAccess);
if (error != Success)
return error;
- if (!AddResource(stuff->pid, PictureType, (pointer) pPicture))
+ if (!AddResource(stuff->pid, PictureType, (void *) pPicture))
return BadAlloc;
return Success;
}
@@ -1975,7 +1975,7 @@ ProcRenderCreateConicalGradient(ClientPtr client)
pPicture, RT_NONE, NULL, DixCreateAccess);
if (error != Success)
return error;
- if (!AddResource(stuff->pid, PictureType, (pointer) pPicture))
+ if (!AddResource(stuff->pid, PictureType, (void *) pPicture))
return BadAlloc;
return Success;
}
@@ -2566,7 +2566,7 @@ SProcRenderDispatch(ClientPtr client)
#ifdef PANORAMIX
#define VERIFY_XIN_PICTURE(pPicture, pid, client, mode) {\
- int rc = dixLookupResourceByType((pointer *)&(pPicture), pid,\
+ int rc = dixLookupResourceByType((void **)&(pPicture), pid,\
XRT_PICTURE, client, mode);\
if (rc != Success)\
return rc;\
@@ -2590,7 +2590,7 @@ PanoramiXRenderCreatePicture(ClientPtr client)
int result, j;
REQUEST_AT_LEAST_SIZE(xRenderCreatePictureReq);
- result = dixLookupResourceByClass((pointer *) &refDraw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &refDraw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 12:05:14 +0000