aboutsummaryrefslogtreecommitdiff
path: root/X11
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-04 15:07:35 +0000
committermarha <marha@users.sourceforge.net>2011-05-04 15:07:35 +0000
commit3aa6e4dde5745319ed3051bdb11d107b072282e3 (patch)
tree58804e0e423f3720533f542d9fce6c5ab08b653d /X11
parente4bd55e182560fa87af77ee3ec49fc1a907ead85 (diff)
parent7194f10aa94e3dc9d34eaf8bfa0bdb6c8aa46a38 (diff)
downloadvcxsrv-3aa6e4dde5745319ed3051bdb11d107b072282e3.tar.gz
vcxsrv-3aa6e4dde5745319ed3051bdb11d107b072282e3.tar.bz2
vcxsrv-3aa6e4dde5745319ed3051bdb11d107b072282e3.zip
svn merge ^/branches/released .
Diffstat (limited to 'X11')
-rw-r--r--X11/Xlibint.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/X11/Xlibint.h b/X11/Xlibint.h
index 2bd83a357..78d459e6d 100644
--- a/X11/Xlibint.h
+++ b/X11/Xlibint.h
@@ -336,7 +336,7 @@ extern LockInfoPtr _Xglobal_lock;
* define MALLOC_0_RETURNS_NULL. This is necessary because some
* Xlib code expects malloc(0) to return a valid pointer to storage.
*/
-#ifdef MALLOC_0_RETURNS_NULL
+#if defined(MALLOC_0_RETURNS_NULL) || defined(__clang_analyzer__)
# define Xmalloc(size) malloc(((size) == 0 ? 1 : (size)))
# define Xrealloc(ptr, size) realloc((ptr), ((size) == 0 ? 1 : (size)))