aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/record/set.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-03-02 15:38:08 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-03-03 22:44:44 +0100
commit06bb154df0a4d6e35885bce6a63057bd8f8636e8 (patch)
tree7eb1bb1a0e4633e77edf9d3d8e3829849303f1cd /nx-X11/programs/Xserver/record/set.c
parent6e8aee499ede4f8849653cdd248a6c0db5fb8b76 (diff)
downloadnx-libs-06bb154df0a4d6e35885bce6a63057bd8f8636e8.tar.gz
nx-libs-06bb154df0a4d6e35885bce6a63057bd8f8636e8.tar.bz2
nx-libs-06bb154df0a4d6e35885bce6a63057bd8f8636e8.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/record/set.c')
-rw-r--r--nx-X11/programs/Xserver/record/set.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/record/set.c b/nx-X11/programs/Xserver/record/set.c
index 1ea3fea4a..afb1024dd 100644
--- a/nx-X11/programs/Xserver/record/set.c
+++ b/nx-X11/programs/Xserver/record/set.c
@@ -71,9 +71,6 @@ typedef int Bool;
typedef unsigned short CARD16;
-#define ALLOCATE_LOCAL malloc
-#define DEALLOCATE_LOCAL free
-
#ifndef max
#define max(_a, _b) ( ((_a) > (_b)) ? (_a) : (_b) )
#endif
@@ -358,7 +355,7 @@ IntervalListCreateSet(pIntervals, nIntervals, pMem, memsize)
if (nIntervals > 0)
{
- stackIntervals = (RecordSetInterval *)ALLOCATE_LOCAL(
+ stackIntervals = (RecordSetInterval *)malloc(
sizeof(RecordSetInterval) * nIntervals);
if (!stackIntervals) return NULL;
@@ -416,7 +413,7 @@ IntervalListCreateSet(pIntervals, nIntervals, pMem, memsize)
memcpy(&prls[1], stackIntervals, nIntervals * sizeof(RecordSetInterval));
prls->nIntervals = nIntervals;
bailout:
- if (stackIntervals) DEALLOCATE_LOCAL(stackIntervals);
+ if (stackIntervals) free(stackIntervals);
return (RecordSetPtr)prls;
}