diff options
| author | Björn Gustavsson <[email protected]> | 2016-03-16 12:00:54 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-03-16 12:00:54 +0100 |
| commit | ae61174845dde2ddda537d57ace5b1124b7f4191 (patch) | |
| tree | 6464a94a1c323e397cd6dd5cbb9fd8469587f31d /erts/etc/unix/run_erl.c | |
| parent | cee5b753e8dbd294b2677f684c404d16dcfcd643 (diff) | |
| parent | 395fbd8d02cb314b8ae57b9c02b4293037ca6890 (diff) | |
| download | otp-ae61174845dde2ddda537d57ace5b1124b7f4191.tar.gz otp-ae61174845dde2ddda537d57ace5b1124b7f4191.tar.bz2 otp-ae61174845dde2ddda537d57ace5b1124b7f4191.zip | |
Merge branch 'bjorn/fix-broken-osx-build'
* bjorn/fix-broken-osx-build:
Take out (parts of) broken fp exception support for MacOS X
configure.in: Fix compilation error in ethread.c
run_erl: Don't define _XOPEN_SOURCE on OS X
Diffstat (limited to 'erts/etc/unix/run_erl.c')
| -rw-r--r-- | erts/etc/unix/run_erl.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c index 44efb975ba..22302d539a 100644 --- a/erts/etc/unix/run_erl.c +++ b/erts/etc/unix/run_erl.c @@ -42,9 +42,14 @@ # include "config.h" #endif #ifdef HAVE_WORKING_POSIX_OPENPT -#ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE 600 -#endif +# ifndef _XOPEN_SOURCE + /* On OS X, we must leave _XOPEN_SOURCE undefined in order for + * the prototype of vsyslog() to be included. + */ +# ifndef __APPLE__ +# define _XOPEN_SOURCE 600 +# endif +# endif #endif #include <sys/types.h> #include <sys/wait.h> |