diff options
| author | Rickard Green <[email protected]> | 2011-11-13 21:43:04 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-11-13 21:43:04 +0100 |
| commit | 32ef224c9769cd9359496953075e0133358ccf86 (patch) | |
| tree | 791517a9be6dbf7a9081192edbf96e69f086d2e1 /erts/emulator/sys | |
| parent | ca58731b5df58aa2a8b42c583d1ba7bb929e72b2 (diff) | |
| parent | 15774d2ac5ba38dba287309f91eb7e4f58b9a636 (diff) | |
| download | otp-32ef224c9769cd9359496953075e0133358ccf86.tar.gz otp-32ef224c9769cd9359496953075e0133358ccf86.tar.bz2 otp-32ef224c9769cd9359496953075e0133358ccf86.zip | |
Merge branch 'rickard/win-cs-mutex/OTP-9671'
* rickard/win-cs-mutex/OTP-9671:
Use critical sections as mutex implementation on Windows
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/win32/sys.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index 02d16b83a2..6f33ef7ad6 100644 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -216,6 +216,9 @@ void sys_tty_reset(int exit_code) void erl_sys_args(int* argc, char** argv) { char *event_name; + + erts_sys_env_init(); + nohup = get_and_remove_option(argc, argv, "-nohup"); #ifdef DEBUG @@ -3214,7 +3217,6 @@ erts_sys_pre_init(void) } #endif erts_smp_atomic_init_nob(&sys_misc_mem_sz, 0); - erts_sys_env_init(); } void noinherit_std_handle(DWORD type) |