aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/include
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-26 01:51:18 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 14:05:30 +0200
commit2646fc254e75c4a7fc10d03d1139d0bd708ceae9 (patch)
tree6a183ec2959f55cf8d6850d072b557399b401f7e /nx-X11/include
parentacf87144d019f18e646501657d9082c6eba77f54 (diff)
downloadnx-libs-2646fc254e75c4a7fc10d03d1139d0bd708ceae9.tar.gz
nx-libs-2646fc254e75c4a7fc10d03d1139d0bd708ceae9.tar.bz2
nx-libs-2646fc254e75c4a7fc10d03d1139d0bd708ceae9.zip
nx-X11/programs/Xserver: Drop {X,x}alloc() macros, use malloc() instead.
Diffstat (limited to 'nx-X11/include')
-rw-r--r--nx-X11/include/Xthreads.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/nx-X11/include/Xthreads.h b/nx-X11/include/Xthreads.h
index 97fda5948..b0ec7df32 100644
--- a/nx-X11/include/Xthreads.h
+++ b/nx-X11/include/Xthreads.h
@@ -33,9 +33,6 @@ in this Software without prior written authorization from The Open Group.
/* Redefine these to XtMalloc/XtFree or whatever you want before including
* this header file.
*/
-#ifndef xmalloc
-#define xmalloc malloc
-#endif
#ifdef CTHREADS
#include <cthreads.h>
@@ -279,13 +276,13 @@ static xthread_t _X_no_thread_id;
typedef xcondition_rec *xcondition_t;
typedef xmutex_rec *xmutex_t;
#ifndef xcondition_malloc
-#define xcondition_malloc() (xcondition_t)xmalloc(sizeof(xcondition_rec))
+#define xcondition_malloc() (xcondition_t)malloc(sizeof(xcondition_rec))
#endif
#ifndef xcondition_free
#define xcondition_free(c) free((char *)c)
#endif
#ifndef xmutex_malloc
-#define xmutex_malloc() (xmutex_t)xmalloc(sizeof(xmutex_rec))
+#define xmutex_malloc() (xmutex_t)malloc(sizeof(xmutex_rec))
#endif
#ifndef xmutex_free
#define xmutex_free(m) free((char *)m)