diff options
| author | Patrik Nyblom <[email protected]> | 2013-08-01 12:18:12 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-08-01 12:18:12 +0200 |
| commit | d9f1c1f1bc658d133b9198e4564e419597793cb4 (patch) | |
| tree | 87340896eb00077348a6ef6b4a01f6019aa57e1e /erts | |
| parent | 6bd5f710d75bb740b91e6c08cd3b08e68519c9d3 (diff) | |
| parent | 397caf87b39380f5517954320f25fdf9b97d0c90 (diff) | |
| download | otp-d9f1c1f1bc658d133b9198e4564e419597793cb4.tar.gz otp-d9f1c1f1bc658d133b9198e4564e419597793cb4.tar.bz2 otp-d9f1c1f1bc658d133b9198e4564e419597793cb4.zip | |
Merge branch 'pan/erlang_halt_2_wrong_flush_default/OTP-11218' into maint
* pan/erlang_halt_2_wrong_flush_default/OTP-11218:
Change default of erlang:halt/2 to the documented
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/bif.c | 2 |
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); |