From 74932408e62100dec7ece2365ee221e68a809de7 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Fri, 26 Feb 2016 11:00:33 +0100 Subject: erts: Fix run_erl syslog prototypes for freebsd --- erts/configure.in | 2 +- erts/etc/unix/run_erl.c | 9 ++++----- 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 #include -#ifdef __ANDROID__ -# include -#endif - #ifdef HAVE_SYSLOG_H # include #endif @@ -77,6 +73,9 @@ #ifdef HAVE_UTMP_H # include #endif +#ifdef HAVE_LIBUTIL_H +# include +#endif #ifdef HAVE_UTIL_H # include #endif -- cgit v1.2.3