diff options
author | Lukas Larsson <[email protected]> | 2016-03-18 15:22:24 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-03-18 15:22:24 +0100 |
commit | 06c0c79a1159345d7a3232d3cbb9cfc8975ef73f (patch) | |
tree | 91bf967c65e0216e38e62f6c3e9787b6924b9b3f /erts/configure.in | |
parent | b00fe8c7d5740f53bef4f7884d408052631c0cb5 (diff) | |
parent | 74932408e62100dec7ece2365ee221e68a809de7 (diff) | |
download | otp-06c0c79a1159345d7a3232d3cbb9cfc8975ef73f.tar.gz otp-06c0c79a1159345d7a3232d3cbb9cfc8975ef73f.tar.bz2 otp-06c0c79a1159345d7a3232d3cbb9cfc8975ef73f.zip |
Merge branch 'lukas/erts/fix-vsyslog-freebsd/OTP-13427'
* lukas/erts/fix-vsyslog-freebsd/OTP-13427:
erts: Fix run_erl syslog prototypes for freebsd
Conflicts:
erts/etc/unix/run_erl.c
Diffstat (limited to 'erts/configure.in')
-rw-r--r-- | erts/configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in index cae3843465..1d15ae467c 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -1623,7 +1623,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__ |