From d389ff6f96cbd855e95a7455407b6140f1601d0f Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Tue, 17 Aug 2010 23:05:43 +0200 Subject: Initialize environment functionality after thread lib An assertion failed due to the thread library not being initialized when initializing an rwmutex. This was however harmless. --- erts/emulator/sys/win32/sys.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'erts/emulator/sys') diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index 54f71b202d..f37b7bbbe5 100644 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -3002,7 +3002,6 @@ 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) @@ -3018,6 +3017,8 @@ 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); -- cgit v1.2.3