aboutsummaryrefslogtreecommitdiff
path: root/compat.h
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2020-11-03 08:35:52 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2020-11-03 08:35:52 +0000
commitba9962b568dd111455963c88b0458cf8847c9690 (patch)
treea13a66498befbd75237a3a7a3869ccd2c52b8452 /compat.h
parent733abfcfc5b05cb3e1f2cf08f00a9325c6f6fa04 (diff)
parentff53eed402abb146096673963da39b5036a5c861 (diff)
downloadrtmux-ba9962b568dd111455963c88b0458cf8847c9690.tar.gz
rtmux-ba9962b568dd111455963c88b0458cf8847c9690.tar.bz2
rtmux-ba9962b568dd111455963c88b0458cf8847c9690.zip
Merge branch 'master' into 3.2-rc
Diffstat (limited to 'compat.h')
-rw-r--r--compat.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/compat.h b/compat.h
index 5b23b178..b213336f 100644
--- a/compat.h
+++ b/compat.h
@@ -27,6 +27,10 @@
#include <termios.h>
#include <wchar.h>
+#ifdef HAVE_MALLOC_TRIM
+#include <malloc.h>
+#endif
+
#ifdef HAVE_UTF8PROC
#include <utf8proc.h>
#endif
@@ -35,6 +39,10 @@
#define __attribute__(a)
#endif
+#ifdef BROKEN___DEAD
+#undef __dead
+#endif
+
#ifndef __unused
#define __unused __attribute__ ((__unused__))
#endif