diff options
| author | Micael Karlberg <[email protected]> | 2011-09-19 19:26:54 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-19 19:26:54 +0200 |
| commit | 7c730a573a7e239f41bc619b024a675667767428 (patch) | |
| tree | 1265ca1ddae47b094af21f669d0526c9c1b074dd /erts/emulator/sys/unix/sys.c | |
| parent | 13fcdd5c954ddbb8ac9401d73f8e77423fbd976c (diff) | |
| parent | e84f232326b2800ca806c867b2bfbe3652d423cb (diff) | |
| download | otp-7c730a573a7e239f41bc619b024a675667767428.tar.gz otp-7c730a573a7e239f41bc619b024a675667767428.tar.bz2 otp-7c730a573a7e239f41bc619b024a675667767428.zip | |
Merge branch 'dev' of super:otp into bmk/inets/inets571_integration
Diffstat (limited to 'erts/emulator/sys/unix/sys.c')
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index bafbbb0f6c..e5ee0df7fa 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -527,7 +527,6 @@ erts_sys_pre_init(void) void erl_sys_init(void) { - erts_smp_rwmtx_init(&environ_rwmtx, "environ"); #if !DISABLE_VFORK { int res; @@ -3090,6 +3089,8 @@ erl_sys_args(int* argc, char** argv) { int i, j; + erts_smp_rwmtx_init(&environ_rwmtx, "environ"); + i = 1; ASSERT(argc && argv); @@ -3151,4 +3152,5 @@ erl_sys_args(int* argc, char** argv) argv[j++] = argv[i]; } *argc = j; + } |