aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/miext
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/miext
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/miext')
-rw-r--r--nx-X11/programs/Xserver/miext/damage/damage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c
index a56b9877e..ca8128975 100644
--- a/nx-X11/programs/Xserver/miext/damage/damage.c
+++ b/nx-X11/programs/Xserver/miext/damage/damage.c
@@ -1347,7 +1347,7 @@ damageText (DrawablePtr pDrawable,
imageblt = (textType == TT_IMAGE8) || (textType == TT_IMAGE16);
- charinfo = (CharInfoPtr *) ALLOCATE_LOCAL(count * sizeof(CharInfoPtr));
+ charinfo = (CharInfoPtr *) malloc(count * sizeof(CharInfoPtr));
if (!charinfo)
return x;
@@ -1369,7 +1369,7 @@ damageText (DrawablePtr pDrawable,
(*pGC->ops->PolyGlyphBlt)(pDrawable, pGC, x, y, n, charinfo,
FONTGLYPHS(pGC->font));
}
- DEALLOCATE_LOCAL(charinfo);
+ free(charinfo);
return x + w;
}