aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/render/mitri.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-03-02 15:38:08 +0100
committerUlrich Sibiller <uli42@gmx.de>2017-03-03 18:58:43 +0100
commit09ef99919c010801bd4220d482a867035b6f4f25 (patch)
tree78bbb0c52085036b2a3ff82b29f242173bf39eda /nx-X11/programs/Xserver/render/mitri.c
parent89ccf26d65a3f205e54d9f6240b672f970e7b9c1 (diff)
downloadnx-libs-09ef99919c010801bd4220d482a867035b6f4f25.tar.gz
nx-libs-09ef99919c010801bd4220d482a867035b6f4f25.tar.bz2
nx-libs-09ef99919c010801bd4220d482a867035b6f4f25.zip
replace (DE)ALLOCATE_LOCAL by malloc/free
This is basically a backport of the following commits + replacing xalloc/xfree by malloc/free. Fixes ArcticaProject/nx-libs#358. commit 2761c103311a1160bc483fd0367d654733df8598 Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Nov 5 14:03:26 2007 +0000 OS: Remove usage of alloca Replace with heap allocations. commit 5e363500c86042c394595e1a6633581eb8fcd1bb Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Nov 5 14:38:28 2007 +0000 OS: Remove ALLOCATE_LOCAL from os.h Remove ALLOCATE_LOCAL_FALLBACK and DEALLOCATE_LOCAL_FALLBACK from os.h, and remove the include of Xalloca.h as well.
Diffstat (limited to 'nx-X11/programs/Xserver/render/mitri.c')
-rw-r--r--nx-X11/programs/Xserver/render/mitri.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/render/mitri.c b/nx-X11/programs/Xserver/render/mitri.c
index bc2641895..9adc7180e 100644
--- a/nx-X11/programs/Xserver/render/mitri.c
+++ b/nx-X11/programs/Xserver/render/mitri.c
@@ -145,7 +145,7 @@ miTriStrip (CARD8 op,
if (npoint < 3)
return;
ntri = npoint - 2;
- tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
+ tris = malloc (ntri * sizeof (xTriangle));
if (!tris)
return;
for (tri = tris; npoint >= 3; npoint--, points++, tri++)
@@ -155,7 +155,7 @@ miTriStrip (CARD8 op,
tri->p3 = points[2];
}
(*ps->Triangles) (op, pSrc, pDst, maskFormat, xSrc, ySrc, ntri, tris);
- DEALLOCATE_LOCAL (tris);
+ free (tris);
}
void
@@ -177,7 +177,7 @@ miTriFan (CARD8 op,
if (npoint < 3)
return;
ntri = npoint - 2;
- tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
+ tris = malloc (ntri * sizeof (xTriangle));
if (!tris)
return;
first = points++;
@@ -188,5 +188,5 @@ miTriFan (CARD8 op,
tri->p3 = points[1];
}
(*ps->Triangles) (op, pSrc, pDst, maskFormat, xSrc, ySrc, ntri, tris);
- DEALLOCATE_LOCAL (tris);
+ free (tris);
}