diff options
| author | John Högberg <[email protected]> | 2017-09-06 12:42:28 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-09-06 13:48:51 +0200 |
| commit | 0cc04010ae73fcb591be4f35c00eb61b653cc0d0 (patch) | |
| tree | 01f3790ea5682742297cb786cd676fb49ae21dc0 /erts/preloaded | |
| parent | 28759f8cbde480be7782bac9169eeb9e4fb60bce (diff) | |
| parent | ad5d9eef3f41274f08008cdbb43afb2088d3276e (diff) | |
| download | otp-0cc04010ae73fcb591be4f35c00eb61b653cc0d0.tar.gz otp-0cc04010ae73fcb591be4f35c00eb61b653cc0d0.tar.bz2 otp-0cc04010ae73fcb591be4f35c00eb61b653cc0d0.zip | |
Merge branch 'maint' into john/erts/merge-zlib-and-vector-q
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 107104 -> 107320 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 12 |
2 files changed, 11 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 81527dc164..e258ff5480 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 4315b53358..d43fdc454c 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -97,6 +97,10 @@ -export_type([dist_handle/0]). +-type iovec() :: [binary()]. + +-export_type([iovec/0]). + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Native code BIF stubs and their types %% (BIF's actually implemented in this module goes last in the file) @@ -134,7 +138,7 @@ has_prepared_code_on_load/1, hibernate/3]). -export([insert_element/3]). -export([integer_to_binary/1, integer_to_list/1]). --export([iolist_size/1, iolist_to_binary/1]). +-export([iolist_size/1, iolist_to_binary/1, iolist_to_iovec/1]). -export([is_alive/0, is_builtin/3, is_process_alive/1, length/1, link/1]). -export([list_to_atom/1, list_to_binary/1]). -export([list_to_bitstring/1, list_to_existing_atom/1, list_to_float/1]). @@ -1089,6 +1093,12 @@ iolist_size(_Item) -> iolist_to_binary(_IoListOrBinary) -> erlang:nif_error(undefined). +%% iolist_to_iovec/1 +-spec erlang:iolist_to_iovec(IoListOrBinary) -> iovec() when + IoListOrBinary :: iolist() | binary(). +iolist_to_iovec(_IoListOrBinary) -> + erlang:nif_error(undefined). + %% is_alive/0 -spec is_alive() -> boolean(). is_alive() -> |