summaryrefslogtreecommitdiff
path: root/hw/xnest/GC.c
diff options
context:
space:
mode:
authorMikhail Gusarov <dottedmag@dottedmag.net>2010-05-06 01:44:06 +0700
committerMikhail Gusarov <dottedmag@dottedmag.net>2010-05-13 00:22:37 +0700
commit3f3ff971ecff9936cebafc813af9193b97bba89c (patch)
treefdbbad794a42488b7ffe41eed7aba4e498335f55 /hw/xnest/GC.c
parent96c7ab27c383ec767f62a7a11e5fd76f86363fbc (diff)
Replace X-allocation functions with their C89 counterparts
The only remaining X-functions used in server are XNF*, the rest is converted to plain alloc/calloc/realloc/free/strdup. X* functions are still exported from server and x* macros are still defined in header file, so both ABI and API are not affected by this change. Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/xnest/GC.c')
-rw-r--r--hw/xnest/GC.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index 65425e98f..4082bfc57 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -212,7 +212,7 @@ xnestChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
case CT_REGION:
nRects = REGION_NUM_RECTS((RegionPtr)pValue);
size = nRects * sizeof(*pRects);
- pRects = (XRectangle *) xalloc(size);
+ pRects = (XRectangle *) malloc(size);
pBox = REGION_RECTS((RegionPtr)pValue);
for (i = nRects; i-- > 0; ) {
pRects[i].x = pBox[i].x1;
@@ -222,7 +222,7 @@ xnestChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
}
XSetClipRectangles(xnestDisplay, xnestGC(pGC), 0, 0,
pRects, nRects, Unsorted);
- xfree((char *) pRects);
+ free((char *) pRects);
break;
case CT_PIXMAP:
@@ -279,7 +279,7 @@ xnestChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
*/
pGC->clientClip = (pointer) RECTS_TO_REGION(pGC->pScreen, nRects,
(xRectangle *)pValue, type);
- xfree(pValue);
+ free(pValue);
pValue = pGC->clientClip;
type = CT_REGION;