diff options
| author | Rickard Green <[email protected]> | 2010-08-17 23:05:43 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-08-30 12:01:41 +0200 |
| commit | d389ff6f96cbd855e95a7455407b6140f1601d0f (patch) | |
| tree | 464bdf6f5f52feb880505aeabdc17d4bbf317238 /erts/emulator/sys/win32 | |
| parent | 026940a3cf528a115dcc5e2bfb89f0ce78907031 (diff) | |
| download | otp-d389ff6f96cbd855e95a7455407b6140f1601d0f.tar.gz otp-d389ff6f96cbd855e95a7455407b6140f1601d0f.tar.bz2 otp-d389ff6f96cbd855e95a7455407b6140f1601d0f.zip | |
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.
Diffstat (limited to 'erts/emulator/sys/win32')
| -rw-r--r-- | erts/emulator/sys/win32/sys.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |