diff options
| author | Sverker Eriksson <[email protected]> | 2011-04-27 17:14:35 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-04-27 17:14:35 +0200 |
| commit | 574de87663ecee7043df1783e7c3b830193b0399 (patch) | |
| tree | 8351d2af0973274534168f5442c0900bce0703f8 /erts/emulator/beam/dist.c | |
| parent | ef407fad10bccb97aab140f5b99786b8c7b2237a (diff) | |
| parent | 261a3e9b465a1d9cbd0361c5d3801bf63950e623 (diff) | |
| download | otp-574de87663ecee7043df1783e7c3b830193b0399.tar.gz otp-574de87663ecee7043df1783e7c3b830193b0399.tar.bz2 otp-574de87663ecee7043df1783e7c3b830193b0399.zip | |
Merge branch 'sverker/erts_printf-halfword' into dev
* sverker/erts_printf-halfword:
erts_printf %be to print integers of size Eterm
Fix use of type BeamInstr in hipe_debug.c
Conflicts:
erts/emulator/hipe/hipe_debug.c
Diffstat (limited to 'erts/emulator/beam/dist.c')
| -rw-r--r-- | erts/emulator/beam/dist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index 05eddf4ae0..b1cdd0660a 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -1687,7 +1687,7 @@ dist_port_command(Port *prt, ErtsDistOutputBuf *obuf) if (size > (Uint) INT_MAX) erl_exit(ERTS_ABORT_EXIT, "Absurdly large distribution output data buffer " - "(%bpu bytes) passed.\n", + "(%beu bytes) passed.\n", size); prt->caller = NIL; @@ -1714,7 +1714,7 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf) if (size > (Uint) INT_MAX) erl_exit(ERTS_ABORT_EXIT, "Absurdly large distribution output data buffer " - "(%bpu bytes) passed.\n", + "(%beu bytes) passed.\n", size); iov[0].iov_base = NULL; |