diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-09-04 14:52:23 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-09-04 14:52:23 +0200 |
| commit | d65378620c73fb203ada59caa5fadee5bc660fe0 (patch) | |
| tree | a854e3271bf706bf62fc452873bca32faa88a0d4 /erts/etc | |
| parent | 0e3d82ec72c0f439812d154e92d591b981986037 (diff) | |
| parent | e036643fbd5c5cba7f652734966570fee7ca99b3 (diff) | |
| download | otp-d65378620c73fb203ada59caa5fadee5bc660fe0.tar.gz otp-d65378620c73fb203ada59caa5fadee5bc660fe0.tar.bz2 otp-d65378620c73fb203ada59caa5fadee5bc660fe0.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/run_erl_common.c | 19 | ||||
| -rw-r--r-- | erts/etc/unix/run_erl.c | 4 |
2 files changed, 14 insertions, 9 deletions
diff --git a/erts/etc/common/run_erl_common.c b/erts/etc/common/run_erl_common.c index dc55c2bea4..580b6cc3c5 100644 --- a/erts/etc/common/run_erl_common.c +++ b/erts/etc/common/run_erl_common.c @@ -74,15 +74,6 @@ * run_erl multiple times with different global variables without them * effecting eachother. */ -typedef struct run_erl_ run_erl; - -#ifdef __OSE__ -static OSPPDKEY run_erl_pp_key; -#define RE_DATA (*(run_erl**)ose_get_ppdata(run_erl_pp_key)) -#else -static run_erl re; -#define RE_DATA (&re) -#endif #define STATUSFILE (RE_DATA->statusfile) #define LOG_DIR (RE_DATA->log_dir) @@ -116,6 +107,16 @@ struct run_erl_ { unsigned protocol_ver; }; +typedef struct run_erl_ run_erl; + +#ifdef __OSE__ +static OSPPDKEY run_erl_pp_key; +#define RE_DATA (*(run_erl**)ose_get_ppdata(run_erl_pp_key)) +#else +static run_erl re; +#define RE_DATA (&re) +#endif + /* prototypes */ static int next_log(int log_num); diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c index a6fc4c2bf5..4b123b8911 100644 --- a/erts/etc/unix/run_erl.c +++ b/erts/etc/unix/run_erl.c @@ -40,9 +40,13 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif + #ifdef HAVE_WORKING_POSIX_OPENPT +#ifndef _XOPEN_SOURCE #define _XOPEN_SOURCE 600 #endif +#endif + #include <sys/types.h> #include <sys/wait.h> #include <sys/stat.h> |