aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/win32/sys.c
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-09-16 14:41:28 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-09-16 14:41:28 +0200
commita6b27d639e5c7c85e765331cfe7befbe23c4954b (patch)
tree745d5193470835be21d79eff015ca9f06194ce97 /erts/emulator/sys/win32/sys.c
parent0c41940bef1d80b6b335cb0a77d5608d9bbe27fd (diff)
parent604967b4c184249d8604f327bb4e683e2c453de8 (diff)
downloadotp-a6b27d639e5c7c85e765331cfe7befbe23c4954b.tar.gz
otp-a6b27d639e5c7c85e765331cfe7befbe23c4954b.tar.bz2
otp-a6b27d639e5c7c85e765331cfe7befbe23c4954b.zip
Merge branch 'pan/win_erlsrv_stop/OTP-9344' into dev
* pan/win_erlsrv_stop/OTP-9344: Move init of smp rw mutex from init to sys_args to make sure that it is initialized before the first erts_sys_getenv call Move erts_sys_env_init() to erts_sys_pre_init() Remove _DEBUG from start_erl.c Spelling correction in erlsrv doc Convert windows start_erl to take rootdir on command line Add command start_disabled to erlsrv Add global lock for erlsrv to avoid races Change start order so that service_event gets initialized before it's used
Diffstat (limited to 'erts/emulator/sys/win32/sys.c')
-rw-r--r--erts/emulator/sys/win32/sys.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index a2159d063c..76db355a9c 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -3282,6 +3282,7 @@ erts_sys_pre_init(void)
}
#endif
erts_smp_atomic_init(&sys_misc_mem_sz, 0);
+ erts_sys_env_init();
}
void noinherit_std_handle(DWORD type)
@@ -3297,8 +3298,6 @@ void erl_sys_init(void)
{
HANDLE handle;
- erts_sys_env_init();
-
noinherit_std_handle(STD_OUTPUT_HANDLE);
noinherit_std_handle(STD_INPUT_HANDLE);
noinherit_std_handle(STD_ERROR_HANDLE);