diff options
| author | Lukas Larsson <[email protected]> | 2016-03-29 14:57:29 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-03-29 14:57:29 +0200 |
| commit | 3f190b62031783ad4fc9bb1fb91703a1b1b40ad7 (patch) | |
| tree | 7b1a00e113b4350c373bc7f4f58daaf5032c947a /erts/emulator/beam/external.h | |
| parent | 96a0a707c6a7ba7ce9d6668705ca10c66666a8c3 (diff) | |
| parent | ed81bb9ed8114d2059783e2c2fdae526d3a36e1e (diff) | |
| download | otp-3f190b62031783ad4fc9bb1fb91703a1b1b40ad7.tar.gz otp-3f190b62031783ad4fc9bb1fb91703a1b1b40ad7.tar.bz2 otp-3f190b62031783ad4fc9bb1fb91703a1b1b40ad7.zip | |
Merge branch 'lukas/erts/enif_trace_functions/OTP-13442'
* lukas/erts/enif_trace_functions/OTP-13442:
erts: Fix bug in enif_send
erts: Fix windows nif port tests
erts: Fix bug in enif_term_to_binary
erts: Remove printout when dec_term fails in DEBUG
erts: Polish erl_nif docs
erts: Improve enif_binary_to_term
erts: Add enif_port_command
erts: Add enif_term_to_binary and enif_binary_to_term
erts: Add enif_is_process/port_alive
erts: Add enif_cpu/now_time and enif_make_unique_integer
Diffstat (limited to 'erts/emulator/beam/external.h')
| -rw-r--r-- | erts/emulator/beam/external.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/external.h b/erts/emulator/beam/external.h index d12051c6b4..87eff2fe9f 100644 --- a/erts/emulator/beam/external.h +++ b/erts/emulator/beam/external.h @@ -191,7 +191,7 @@ Eterm erts_decode_dist_ext(ErtsHeapFactory* factory, ErtsDistExternal *); Sint erts_decode_ext_size(byte*, Uint); Sint erts_decode_ext_size_ets(byte*, Uint); -Eterm erts_decode_ext(ErtsHeapFactory*, byte**); +Eterm erts_decode_ext(ErtsHeapFactory*, byte**, Uint32 flags); Eterm erts_decode_ext_ets(ErtsHeapFactory*, byte*); Eterm erts_term_to_binary(Process* p, Eterm Term, int level, Uint flags); |