aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-04-29 14:57:59 +0200
committerZandra Hird <[email protected]>2015-04-29 14:57:59 +0200
commit147e8b9bd0b36315f0d8bd38e39c51d93cd9f509 (patch)
tree5496f19b73bc6fffa978bbf0dc8edbfa29ac73bf /erts
parent5758f481ea259d78004a0a770cea2cc23dbf282e (diff)
parent7e86d9dd50dc54a38e09bf9774f14276e7c55804 (diff)
downloadotp-147e8b9bd0b36315f0d8bd38e39c51d93cd9f509.tar.gz
otp-147e8b9bd0b36315f0d8bd38e39c51d93cd9f509.tar.bz2
otp-147e8b9bd0b36315f0d8bd38e39c51d93cd9f509.zip
Merge branch 'JeromeDeBretagne/fix_android_build'
OTP-12693
Diffstat (limited to 'erts')
-rw-r--r--erts/etc/common/run_erl_common.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/etc/common/run_erl_common.c b/erts/etc/common/run_erl_common.c
index 20b78eb05e..ab420e3bee 100644
--- a/erts/etc/common/run_erl_common.c
+++ b/erts/etc/common/run_erl_common.c
@@ -32,6 +32,10 @@
#include <time.h>
#include <unistd.h>
+#ifdef __ANDROID__
+# include <termios.h>
+#endif
+
#ifdef HAVE_SYSLOG_H
# include <syslog.h>
#endif