hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-18 19:52:21 +00:00
Code Issues Projects Releases Wiki Activity

Replace 'pointer' type with 'void *'

Browse source 
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:
Keith Packard 2013-12-15 01:05:51 -08:00
commit 60014a4a98
319 changed files with 1917 additions and 1914 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xfixes/region.c
View file

@ -35,7 +35,7 @@
RESTYPE RegionResType;
static int
RegionResFree(pointer data, XID id)
RegionResFree(void *data, XID id)
{
RegionPtr pRegion = (RegionPtr) data;
@ -85,7 +85,7 @@ ProcXFixesCreateRegion(ClientPtr client)
pRegion = RegionFromRects(things, (xRectangle *) (stuff + 1), CT_UNSORTED);
if (!pRegion)
return BadAlloc;
if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@ -115,7 +115,7 @@ ProcXFixesCreateRegionFromBitmap(ClientPtr client)
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromBitmapReq);
LEGAL_NEW_RESOURCE(stuff->region, client);
rc = dixLookupResourceByType((pointer *) &pPixmap, stuff->bitmap, RT_PIXMAP,
rc = dixLookupResourceByType((void **) &pPixmap, stuff->bitmap, RT_PIXMAP,
client, DixReadAccess);
if (rc != Success) {
client->errorValue = stuff->bitmap;
@ -129,7 +129,7 @@ ProcXFixesCreateRegionFromBitmap(ClientPtr client)
if (!pRegion)
return BadAlloc;
if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@ -159,7 +159,7 @@ ProcXFixesCreateRegionFromWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromWindowReq);
LEGAL_NEW_RESOURCE(stuff->region, client);
rc = dixLookupResourceByType((pointer *) &pWin, stuff->window, RT_WINDOW,
rc = dixLookupResourceByType((void **) &pWin, stuff->window, RT_WINDOW,
client, DixGetAttrAccess);
if (rc != Success) {
client->errorValue = stuff->window;
@ -188,7 +188,7 @@ ProcXFixesCreateRegionFromWindow(ClientPtr client)
pRegion = XFixesRegionCopy(pRegion);
if (!pRegion)
return BadAlloc;
if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@ -238,7 +238,7 @@ ProcXFixesCreateRegionFromGC(ClientPtr client)
return BadImplementation; /* assume sane server bits */
}
if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@ -285,7 +285,7 @@ ProcXFixesCreateRegionFromPicture(ClientPtr client)
return BadImplementation; /* assume sane server bits */
}
if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@ -629,7 +629,7 @@ ProcXFixesSetGCClipRegion(ClientPtr client)
vals[1].val = stuff->yOrigin;
ChangeGC(NullClient, pGC, GCClipXOrigin | GCClipYOrigin, vals);
(*pGC->funcs->ChangeClip) (pGC, pRegion ? CT_REGION : CT_NONE,
(pointer) pRegion, 0);
(void *) pRegion, 0);
return Success;
}
@ -661,7 +661,7 @@ ProcXFixesSetWindowShapeRegion(ClientPtr client)
REQUEST(xXFixesSetWindowShapeRegionReq);
REQUEST_SIZE_MATCH(xXFixesSetWindowShapeRegionReq);
rc = dixLookupResourceByType((pointer *) &pWin, stuff->dest, RT_WINDOW,
rc = dixLookupResourceByType((void **) &pWin, stuff->dest, RT_WINDOW,
client, DixSetAttrAccess);
if (rc != Success) {
client->errorValue = stuff->dest;