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/etc | |
| 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/etc')
| -rw-r--r-- | erts/etc/unix/run_erl.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c index 22302d539a..30210ac172 100644 --- a/erts/etc/unix/run_erl.c +++ b/erts/etc/unix/run_erl.c @@ -43,10 +43,10 @@ #endif #ifdef HAVE_WORKING_POSIX_OPENPT # ifndef _XOPEN_SOURCE - /* On OS X, we must leave _XOPEN_SOURCE undefined in order for + /* On OS X and BSD, we must leave _XOPEN_SOURCE undefined in order for * the prototype of vsyslog() to be included. */ -# ifndef __APPLE__ +# if !(defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)) # define _XOPEN_SOURCE 600 # endif # endif @@ -69,10 +69,6 @@ #include <termios.h> #include <time.h> -#ifdef __ANDROID__ -# include <termios.h> -#endif - #ifdef HAVE_SYSLOG_H # include <syslog.h> #endif @@ -82,6 +78,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 |