aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-11-17 13:10:50 +0100
committerZandra <[email protected]>2015-11-17 13:10:50 +0100
commitfa2438389769a65dbd12caea0d7ab6510bbe0e42 (patch)
tree7ddc7453bbcc6eba765d40a24f00fa214ad8de57 /erts
parenta7f3e7c6e65d845e8a6d0c5e3b5fad83c1036ace (diff)
parent2e83a9026bb7d6688d878fa8d17d47253e40482f (diff)
downloadotp-fa2438389769a65dbd12caea0d7ab6510bbe0e42.tar.gz
otp-fa2438389769a65dbd12caea0d7ab6510bbe0e42.tar.bz2
otp-fa2438389769a65dbd12caea0d7ab6510bbe0e42.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/etc/common/heart.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c
index 01ef840b5d..9571b83ffd 100644
--- a/erts/etc/common/heart.c
+++ b/erts/etc/common/heart.c
@@ -718,14 +718,12 @@ do_terminate(int erlin_fd, int reason) {
print_error("Would reboot. Terminating.");
else {
kill_old_erlang();
- /* suppress gcc warning with 'if' */
ret = system(command);
print_error("Executed \"%s\" -> %d. Terminating.",command, ret);
}
free_env_val(command);
} else {
kill_old_erlang();
- /* suppress gcc warning with 'if' */
ret = system((char*)&cmd[0]);
print_error("Executed \"%s\" -> %d. Terminating.",cmd, ret);
}