aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2011-06-15 14:46:07 +0200
committerPatrik Nyblom <[email protected]>2011-06-15 14:46:07 +0200
commit4f66e1a8f193c41d7de62011afde4803ba8f09f1 (patch)
tree6a18de568997aec036d3273d2178145d5694a372 /erts/emulator/sys
parent9df8a8c8ff47f69594add5ae91f76b1acf27f7fe (diff)
downloadotp-4f66e1a8f193c41d7de62011afde4803ba8f09f1.tar.gz
otp-4f66e1a8f193c41d7de62011afde4803ba8f09f1.tar.bz2
otp-4f66e1a8f193c41d7de62011afde4803ba8f09f1.zip
Move erts_sys_env_init() to erts_sys_pre_init()
Diffstat (limited to 'erts/emulator/sys')
-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);