aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix/region.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-26 01:38:22 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 14:05:30 +0200
commitacf87144d019f18e646501657d9082c6eba77f54 (patch)
treedadb838cd54010836230358a4a5805bb0696b5bb /nx-X11/programs/Xserver/dix/region.c
parent279d37127db241a9ee685f6b671f51aa21a972ea (diff)
downloadnx-libs-acf87144d019f18e646501657d9082c6eba77f54.tar.gz
nx-libs-acf87144d019f18e646501657d9082c6eba77f54.tar.bz2
nx-libs-acf87144d019f18e646501657d9082c6eba77f54.zip
nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead.
Fixes ArcticaProject/nx-libs#105
Diffstat (limited to 'nx-X11/programs/Xserver/dix/region.c')
-rw-r--r--nx-X11/programs/Xserver/dix/region.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/dix/region.c b/nx-X11/programs/Xserver/dix/region.c
index e927b9fde..4c2bc4695 100644
--- a/nx-X11/programs/Xserver/dix/region.c
+++ b/nx-X11/programs/Xserver/dix/region.c
@@ -172,7 +172,7 @@ Equipment Corporation.
((r1)->y1 <= (r2)->y1) && \
((r1)->y2 >= (r2)->y2) )
-#define xfreeData(reg) if ((reg)->data && (reg)->data->size) xfree((reg)->data)
+#define xfreeData(reg) if ((reg)->data && (reg)->data->size) free((reg)->data)
#define RECTALLOC_BAIL(pReg,n,bail) \
if (!(pReg)->data || (((pReg)->data->numRects + (n)) > (pReg)->data->size)) \
@@ -342,7 +342,7 @@ RegionDestroy(pReg)
good(pReg);
xfreeData(pReg);
if (pReg != &RegionBrokenRegion)
- xfree(pReg);
+ free(pReg);
}
Bool
@@ -795,7 +795,7 @@ RegionOp(
}
if (oldData)
- xfree(oldData);
+ free(oldData);
if (!(numRects = newReg->data->numRects))
{
@@ -1355,13 +1355,13 @@ NextRect: ;
numRI -= half;
}
*badreg = ri[0].reg;
- xfree(ri);
+ free(ri);
good(badreg);
return ret;
bail:
for (i = 0; i < numRI; i++)
xfreeData(&ri[i].reg);
- xfree (ri);
+ free (ri);
return RegionBreak (badreg);
}
@@ -1443,7 +1443,7 @@ RegionFromRects(nrects, prect, ctype)
}
else
{
- xfree (pData);
+ free (pData);
}
return pRgn;
}