diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-09-19 09:42:57 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-09-19 09:42:57 +0200 |
| commit | 87288e173f09d573460a06d98466f84cba8f4b5c (patch) | |
| tree | 2e0949deb7bc6c27e58feb870458dc1583cd4e07 /erts/emulator/sys | |
| parent | adbad8f580825761238c647e181a07678f07d361 (diff) | |
| parent | 2d13b9580f405541e46491743702eaaedf3f6e91 (diff) | |
| download | otp-87288e173f09d573460a06d98466f84cba8f4b5c.tar.gz otp-87288e173f09d573460a06d98466f84cba8f4b5c.tar.bz2 otp-87288e173f09d573460a06d98466f84cba8f4b5c.zip | |
Merge branch 'dev' into major
* dev:
gs: Update to modern type guards in examples
os_mon: Check results from fgets in cpu_sup
erts: Remove compiler warning in sys.c
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index f2fd01e236..82d2c64d81 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -3087,10 +3087,10 @@ get_value(char* rest, char** argv, int* ip) void erl_sys_args(int* argc, char** argv) { - erts_smp_rwmtx_init(&environ_rwmtx, "environ"); - int i, j; + erts_smp_rwmtx_init(&environ_rwmtx, "environ"); + i = 1; ASSERT(argc && argv); |