aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/os.h
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/include/os.h
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/include/os.h')
-rw-r--r--nx-X11/programs/Xserver/include/os.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h
index 5e16d8298..59ace8fd2 100644
--- a/nx-X11/programs/Xserver/include/os.h
+++ b/nx-X11/programs/Xserver/include/os.h
@@ -50,9 +50,6 @@ SOFTWARE.
#define OS_H
#include "misc.h"
-#define ALLOCATE_LOCAL_FALLBACK(_size) malloc((unsigned long)(_size))
-#define DEALLOCATE_LOCAL_FALLBACK(_ptr) free((void *)(_ptr))
-#include <nx-X11/Xalloca.h>
#include <stdarg.h>
#define NullFID ((FID) 0)