diff options
| author | John Högberg <[email protected]> | 2017-11-27 12:42:26 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-11-27 12:42:26 +0100 |
| commit | 0293c3bf9276bea3fc4ab31b2e697dd1be0858ea (patch) | |
| tree | 171847bc34003c148b79d36d77790887811cefbd /erts | |
| parent | 0c79be5d1e16308c50656cd7add5502833fba81d (diff) | |
| parent | afd92e272aa6fa6836e6e5e48e8a68ba519202e1 (diff) | |
| download | otp-0293c3bf9276bea3fc4ab31b2e697dd1be0858ea.tar.gz otp-0293c3bf9276bea3fc4ab31b2e697dd1be0858ea.tar.bz2 otp-0293c3bf9276bea3fc4ab31b2e697dd1be0858ea.zip | |
Merge branch 'john/erts/fix-nif-ioq-version/OTP-14779' into maint
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_nif.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h index d195721054..7fb447e4a8 100644 --- a/erts/emulator/beam/erl_nif.h +++ b/erts/emulator/beam/erl_nif.h @@ -50,10 +50,11 @@ ** 2.9: 18.2 enif_getenv ** 2.10: Time API ** 2.11: 19.0 enif_snprintf -** 2.12: 20.0 add enif_queue +** 2.12: 20.0 add enif_select, enif_open_resource_type_x +** 2.13: 20.1 add enif_ioq */ #define ERL_NIF_MAJOR_VERSION 2 -#define ERL_NIF_MINOR_VERSION 12 +#define ERL_NIF_MINOR_VERSION 13 /* * The emulator will refuse to load a nif-lib with a major version |