diff options
| author | Lukas Larsson <[email protected]> | 2019-06-18 15:36:14 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-06-18 15:36:14 +0200 |
| commit | a4c0f7bbac7f13f620893e047cc2347daf809b57 (patch) | |
| tree | b622157ed6de6aac411898bd50a2611e024845a7 | |
| parent | 0a80a16ccbac0b9730e4345251b3c14a7d6e9890 (diff) | |
| parent | a9373f7f3ee139a62207235f2e197135df4d8aef (diff) | |
| download | otp-a4c0f7bbac7f13f620893e047cc2347daf809b57.tar.gz otp-a4c0f7bbac7f13f620893e047cc2347daf809b57.tar.bz2 otp-a4c0f7bbac7f13f620893e047cc2347daf809b57.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/emulator/beam/dist.c | 2 | ||||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index a077c3a9ef..06996d4894 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -3375,7 +3375,7 @@ dist_get_stat_1(BIF_ALIST_1) am_ok, erts_bld_sint64(hpp, szp, read), erts_bld_sint64(hpp, szp, write), - pend ? am_true : am_false); + erts_bld_sint64(hpp, szp, pend)); if (hpp) break; hp = HAlloc(BIF_P, sz); diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 0ead6ffbc2..12c256169c 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -3361,7 +3361,7 @@ dist_ctrl_get_opt(_DHandle, _Opt) -> DHandle :: dist_handle(), InputPackets :: non_neg_integer(), OutputPackets :: non_neg_integer(), - PendingOutputPackets :: boolean(), + PendingOutputPackets :: non_neg_integer(), Res :: {'ok', InputPackets, OutputPackets, PendingOutputPackets}. dist_get_stat(_DHandle) -> |