diff options
| author | John Högberg <[email protected]> | 2018-03-23 08:19:12 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-03-23 08:19:12 +0100 |
| commit | bf7206f13aae8d55e4d54320a179e11ad8f90765 (patch) | |
| tree | de212a221a5bb2bfeb04261ee5322d4f9f310f03 /erts/emulator/beam/erl_nif.h | |
| parent | 7c2672e614883d8f0eac7559a59d0373ec92af69 (diff) | |
| parent | 187564ffccee4a3b5727bdab3df2458f3b5ced72 (diff) | |
| download | otp-bf7206f13aae8d55e4d54320a179e11ad8f90765.tar.gz otp-bf7206f13aae8d55e4d54320a179e11ad8f90765.tar.bz2 otp-bf7206f13aae8d55e4d54320a179e11ad8f90765.zip | |
Merge branch 'john/erts/nif-map-from-array/OTP-14954'
* john/erts/nif-map-from-array/OTP-14954:
Add enif_make_map_from_arrays
Diffstat (limited to 'erts/emulator/beam/erl_nif.h')
| -rw-r--r-- | erts/emulator/beam/erl_nif.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h index e051ecb26e..1906da732b 100644 --- a/erts/emulator/beam/erl_nif.h +++ b/erts/emulator/beam/erl_nif.h @@ -53,7 +53,7 @@ ** 2.12: 20.0 add enif_select, enif_open_resource_type_x ** 2.13: 20.1 add enif_ioq ** 2.14: 21.0 add enif_ioq_peek_head, enif_(mutex|cond|rwlock|thread)_name -** enif_vfprintf, enif_vsnprintf +** enif_vfprintf, enif_vsnprintf, enif_make_map_from_arrays */ #define ERL_NIF_MAJOR_VERSION 2 #define ERL_NIF_MINOR_VERSION 14 |