diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 21:46:33 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 21:46:33 +0100 |
| commit | 96e2556031c8aff62a4650b9cfb814991f5240e1 (patch) | |
| tree | 78bbb0c52085036b2a3ff82b29f242173bf39eda /nx-X11/programs/Xserver/include | |
| parent | 89ccf26d65a3f205e54d9f6240b672f970e7b9c1 (diff) | |
| parent | 09ef99919c010801bd4220d482a867035b6f4f25 (diff) | |
| download | nx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.tar.gz nx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.tar.bz2 nx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.zip | |
Merge branch 'uli42-pr/remove_allocate_local' into 3.6.x
Attribute GH PR #369: https://github.com/ArcticaProject/nx-libs/pull/369
Diffstat (limited to 'nx-X11/programs/Xserver/include')
| -rw-r--r-- | nx-X11/programs/Xserver/include/os.h | 3 |
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) |