diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-09-05 09:49:59 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-09-05 09:49:59 +0200 |
| commit | 38f49f460ffee0f6f3cbfef129c76e160c63d1a4 (patch) | |
| tree | 7ee410b853ca2ad861c60409fa4fc5d65c3636a9 /erts/etc | |
| parent | 8ad5bd0ef8143f5ac32bd2df11d59a20e7eb0527 (diff) | |
| parent | 35ff91189c8dd4ceed3d8f29536f500787ba4782 (diff) | |
| download | otp-38f49f460ffee0f6f3cbfef129c76e160c63d1a4.tar.gz otp-38f49f460ffee0f6f3cbfef129c76e160c63d1a4.tar.bz2 otp-38f49f460ffee0f6f3cbfef129c76e160c63d1a4.zip | |
Merge branch 'maint' of git-server:otp into 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> |