aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2013-08-01 12:20:20 +0200
committerPatrik Nyblom <[email protected]>2013-08-01 12:20:20 +0200
commit90a600aff71e297d50a16cc3550e4e6c380553e1 (patch)
tree6c103d3d29f7f8a9a4022c8da2ac68992f746425 /erts/emulator
parent9bca214dd7c1c5eb2b3058b2a9be08fe46bb62a4 (diff)
parentd9f1c1f1bc658d133b9198e4564e419597793cb4 (diff)
downloadotp-90a600aff71e297d50a16cc3550e4e6c380553e1.tar.gz
otp-90a600aff71e297d50a16cc3550e4e6c380553e1.tar.bz2
otp-90a600aff71e297d50a16cc3550e4e6c380553e1.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/bif.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index ff237b6a78..755c5e6882 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -3934,7 +3934,7 @@ BIF_RETTYPE halt_2(BIF_ALIST_2)
{
Sint code;
Eterm optlist = BIF_ARG_2;
- int flush = 0;
+ int flush = 1;
for (optlist = BIF_ARG_2;
is_list(optlist);