diff options
| author | Sverker Eriksson <sverker@erlang.org> | 2018-11-01 17:56:47 +0100 |
|---|---|---|
| committer | Sverker Eriksson <sverker@erlang.org> | 2018-11-01 17:56:47 +0100 |
| commit | 32f1d0a39d6c6c5c53e0273bff89d71946ba31e5 (patch) | |
| tree | c5f67463e33b9b0449a8b6732ec45310ea16aa8e | |
| parent | f052c5a50e2bfcf68be7707723cd6eb2f29a8e4a (diff) | |
| parent | 99ce7738ec3996e796d3b7666c63bb17a0e6a78a (diff) | |
| download | erlang-32f1d0a39d6c6c5c53e0273bff89d71946ba31e5.tar.gz | |
Merge branch 'sverker/enif-cancel-select/OTP-15095'
* sverker/enif-cancel-select/OTP-15095:
erts: Bump erl_nif minor version and ERL_NIF_MIN_ERTS_VERSION
| -rw-r--r-- | erts/emulator/beam/erl_nif.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h index c5227a0c23..58a217c20b 100644 --- a/erts/emulator/beam/erl_nif.h +++ b/erts/emulator/beam/erl_nif.h @@ -54,10 +54,16 @@ ** 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_make_map_from_arrays +** 2.15: 22.0 ERL_NIF_SELECT_CANCEL */ #define ERL_NIF_MAJOR_VERSION 2 -#define ERL_NIF_MINOR_VERSION 14 -#define ERL_NIF_MIN_ERTS_VERSION "erts-10.0 (OTP-21)" +#define ERL_NIF_MINOR_VERSION 15 +/* + * WHEN CHANGING INTERFACE VERSION, also replace erts version below + * with ticket syntax like "erts-@OTP-12345@", or a temporary placeholder + * between two @ like "erts-@MyName@", if you don't know what a ticket is. + */ +#define ERL_NIF_MIN_ERTS_VERSION "erts-@OTP-15095@ (OTP-22)" /* * The emulator will refuse to load a nif-lib with a major version |