diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:11:38 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:11:38 +0200 |
commit | 1dbd3c888a3eee51db5303bd93e95b84999f5d31 (patch) | |
tree | 84db92271726b42b8c0864c8b7c77b2330566fc1 /nx-X11/include/Xthreads.h | |
parent | 279d37127db241a9ee685f6b671f51aa21a972ea (diff) | |
parent | e85808245810d0cc6918104deef25213d5f9e06c (diff) | |
download | nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.tar.gz nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.tar.bz2 nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.zip |
Merge branch 'sunweaver-pr/backport-Xorg-memory-handling' into 3.6.x
Attributes GH PR #159: https://github.com/ArcticaProject/nx-libs/pull/159
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 12:47:46 -0700
Diffstat (limited to 'nx-X11/include/Xthreads.h')
-rw-r--r-- | nx-X11/include/Xthreads.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/nx-X11/include/Xthreads.h b/nx-X11/include/Xthreads.h index 41440a2fb..b0ec7df32 100644 --- a/nx-X11/include/Xthreads.h +++ b/nx-X11/include/Xthreads.h @@ -33,12 +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 -#ifndef xfree -#define xfree free -#endif #ifdef CTHREADS #include <cthreads.h> @@ -282,16 +276,16 @@ 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) xfree((char *)c) +#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) xfree((char *)m) +#define xmutex_free(m) free((char *)m) #endif #ifndef xthread_have_id #define xthread_have_id(id) id |