diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:39:55 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:39:55 +0200 |
| commit | cb252aecf7da924e2959dadd390f1bbd320b2eb8 (patch) | |
| tree | 89558d2e19ffd3e197f0df43360e30ab633336b2 /erts/emulator/beam/erl_binary.h | |
| parent | 29a3141244d09fda6700ab3016407c0fa52d92f6 (diff) | |
| parent | efa69184de378b99b1d222c5a0b1c07d9b5a39aa (diff) | |
| download | otp-cb252aecf7da924e2959dadd390f1bbd320b2eb8.tar.gz otp-cb252aecf7da924e2959dadd390f1bbd320b2eb8.tar.bz2 otp-cb252aecf7da924e2959dadd390f1bbd320b2eb8.zip | |
Merge branch 'rickard/yielding-binary-list-conversions/OTP-11888' into maint
* rickard/yielding-binary-list-conversions/OTP-11888:
Add test-case comparing old and new implementations
Make binary BIFs converting from lists yield on large input
Make binary BIFs converting to lists yield on large input
Diffstat (limited to 'erts/emulator/beam/erl_binary.h')
| -rw-r--r-- | erts/emulator/beam/erl_binary.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_binary.h b/erts/emulator/beam/erl_binary.h index 819b19e566..6c9f53ce87 100644 --- a/erts/emulator/beam/erl_binary.h +++ b/erts/emulator/beam/erl_binary.h @@ -166,7 +166,7 @@ Eterm erts_bin_bytes_to_list(Eterm previous, Eterm* hp, byte* bytes, Uint size, * Common implementation for erlang:list_to_binary/1 and binary:list_to_bin/1 */ -BIF_RETTYPE erts_list_to_binary_bif(Process *p, Eterm arg); +BIF_RETTYPE erts_list_to_binary_bif(Process *p, Eterm arg, Export *bif); BIF_RETTYPE erts_gc_binary_part(Process *p, Eterm *reg, Eterm live, int range_is_tuple); BIF_RETTYPE erts_binary_part(Process *p, Eterm binary, Eterm epos, Eterm elen); |