diff options
| author | Sverker Eriksson <[email protected]> | 2018-03-22 16:24:16 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-03-22 16:24:16 +0100 |
| commit | d0bf4974c4eb2808444b8075db994d10bca5c77c (patch) | |
| tree | 76e6b64b53ff9e8ca2dcedf920e4196361d0251d /erts/emulator/beam/erl_nif.h | |
| parent | 7e011bfc8a26a967d9475862634b2a2c54f0e5de (diff) | |
| parent | 6ee8cc56db53fd7951fb3bacfd6621c72fdf3ced (diff) | |
| download | otp-d0bf4974c4eb2808444b8075db994d10bca5c77c.tar.gz otp-d0bf4974c4eb2808444b8075db994d10bca5c77c.tar.bz2 otp-d0bf4974c4eb2808444b8075db994d10bca5c77c.zip | |
Merge branch 'sverker/enif-name-funcs/OTP-14994'
Diffstat (limited to 'erts/emulator/beam/erl_nif.h')
| -rw-r--r-- | erts/emulator/beam/erl_nif.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h index a99b4db705..e051ecb26e 100644 --- a/erts/emulator/beam/erl_nif.h +++ b/erts/emulator/beam/erl_nif.h @@ -52,10 +52,12 @@ ** 2.11: 19.0 enif_snprintf ** 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 +** 2.14: 21.0 add enif_ioq_peek_head, enif_(mutex|cond|rwlock|thread)_name +** enif_vfprintf, enif_vsnprintf */ #define ERL_NIF_MAJOR_VERSION 2 #define ERL_NIF_MINOR_VERSION 14 +#define ERL_NIF_MIN_ERTS_VERSION "erts-10.0 (OTP-21)" /* * The emulator will refuse to load a nif-lib with a major version @@ -70,6 +72,8 @@ #define ERL_NIF_MIN_REQUIRED_MAJOR_VERSION_ON_LOAD 2 #include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> #ifdef __cplusplus extern "C" { @@ -128,6 +132,9 @@ typedef struct enif_entry_t /* Added in 2.12 */ size_t sizeof_ErlNifResourceTypeInit; + + /* Added in 2.14 */ + const char* min_erts; }ErlNifEntry; @@ -350,7 +357,8 @@ ERL_NIF_INIT_DECL(NAME) \ LOAD, RELOAD, UPGRADE, UNLOAD, \ ERL_NIF_VM_VARIANT, \ 1, \ - sizeof(ErlNifResourceTypeInit) \ + sizeof(ErlNifResourceTypeInit), \ + ERL_NIF_MIN_ERTS_VERSION \ }; \ ERL_NIF_INIT_BODY; \ return &entry; \ |