aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-02-26 11:00:33 +0100
committerLukas Larsson <[email protected]>2016-02-29 18:21:00 +0100
commit74932408e62100dec7ece2365ee221e68a809de7 (patch)
tree13574a7d5421c93d09727865d688f8169384620d
parent99eea0aa0d20814aca57a510d0e7484b253f4451 (diff)
downloadotp-74932408e62100dec7ece2365ee221e68a809de7.tar.gz
otp-74932408e62100dec7ece2365ee221e68a809de7.tar.bz2
otp-74932408e62100dec7ece2365ee221e68a809de7.zip
erts: Fix run_erl syslog prototypes for freebsd
-rw-r--r--erts/configure.in2
-rw-r--r--erts/etc/unix/run_erl.c9
2 files changed, 5 insertions, 6 deletions
diff --git a/erts/configure.in b/erts/configure.in
index ba735fe921..e8d904808c 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -1625,7 +1625,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h unistd.h syslog.h dlfcn.h ieeefp.h \
sys/ioctl.h sys/time.h sys/uio.h \
sys/socket.h sys/sockio.h sys/socketio.h \
net/errno.h malloc.h arpa/nameser.h libdlpi.h \
- pty.h util.h utmp.h langinfo.h poll.h sdkddkver.h)
+ pty.h util.h libutil.h utmp.h langinfo.h poll.h sdkddkver.h)
AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr], [], [],
[#ifdef __WIN32__
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index 44efb975ba..ff9bbbafe2 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -41,7 +41,7 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#ifdef HAVE_WORKING_POSIX_OPENPT
+#if defined(HAVE_WORKING_POSIX_OPENPT) && !(defined(__FreeBSD__) || defined(__DragonFly__))
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 600
#endif
@@ -64,10 +64,6 @@
#include <termios.h>
#include <time.h>
-#ifdef __ANDROID__
-# include <termios.h>
-#endif
-
#ifdef HAVE_SYSLOG_H
# include <syslog.h>
#endif
@@ -77,6 +73,9 @@
#ifdef HAVE_UTMP_H
# include <utmp.h>
#endif
+#ifdef HAVE_LIBUTIL_H
+# include <libutil.h>
+#endif
#ifdef HAVE_UTIL_H
# include <util.h>
#endif