aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-09-19 09:42:28 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-09-19 09:42:28 +0200
commit2d13b9580f405541e46491743702eaaedf3f6e91 (patch)
tree41582dd49f44ee1f2ab92a207bd48e40533ba773 /erts/emulator
parent9d1b6de75122c940333fe86b931771cc6f2d67e2 (diff)
parent2c79dee4b4f2a0a692cdf28399fc069eca18f07a (diff)
downloadotp-2d13b9580f405541e46491743702eaaedf3f6e91.tar.gz
otp-2d13b9580f405541e46491743702eaaedf3f6e91.tar.bz2
otp-2d13b9580f405541e46491743702eaaedf3f6e91.zip
Merge branch 'egil/fix-compiler-warning/OTP-9542' into dev
* egil/fix-compiler-warning/OTP-9542: 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')
-rw-r--r--erts/emulator/sys/unix/sys.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index cc08c1d20a..e5ee0df7fa 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);