diff options
| author | Rickard Green <[email protected]> | 2010-08-30 12:09:27 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-08-30 12:09:27 +0200 |
| commit | 4f100fff5844f7af08b1d9be23e990e4a48b27de (patch) | |
| tree | cc3ce0245cfb7d57bc68ec648631ddf3c2329faf /erts/emulator/sys/win32 | |
| parent | c4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac (diff) | |
| parent | d389ff6f96cbd855e95a7455407b6140f1601d0f (diff) | |
| download | otp-4f100fff5844f7af08b1d9be23e990e4a48b27de.tar.gz otp-4f100fff5844f7af08b1d9be23e990e4a48b27de.tar.bz2 otp-4f100fff5844f7af08b1d9be23e990e4a48b27de.zip | |
Merge branch 'rickard/cpu-info/OTP-8765' into dev
* rickard/cpu-info/OTP-8765:
Initialize environment functionality after thread lib
Fix faulty assertions
Implement automatic detection of CPU topology on Windows
Make it possible to reread and update detected CPU information
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 7ec9613288..15d4cd7361 100644 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -3001,7 +3001,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) @@ -3017,6 +3016,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); |