diff options
| author | Sverker Eriksson <[email protected]> | 2015-11-27 12:18:49 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-11-27 12:18:49 +0100 |
| commit | 80bbe3b23ad7781e43dfea3a84203956ccab6a10 (patch) | |
| tree | d038b2b296d373ca55818cdb7b7688f95dbf566f /erts/emulator/beam/erl_nif.h | |
| parent | 29f453a3b2af49cd8f2052959262fc3be8971c46 (diff) | |
| parent | b916edc72a8eb82068229222abde1b9ff43dbad2 (diff) | |
| download | otp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.tar.gz otp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.tar.bz2 otp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_nif.h')
| -rw-r--r-- | erts/emulator/beam/erl_nif.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h index 5da6bb877a..1a21048ec9 100644 --- a/erts/emulator/beam/erl_nif.h +++ b/erts/emulator/beam/erl_nif.h @@ -48,9 +48,10 @@ ** add ErlNifEntry options ** add ErlNifFunc flags ** 2.8: 18.0 add enif_has_pending_exception +** 2.9: 18.2 enif_getenv */ #define ERL_NIF_MAJOR_VERSION 2 -#define ERL_NIF_MINOR_VERSION 8 +#define ERL_NIF_MINOR_VERSION 9 /* * The emulator will refuse to load a nif-lib with a major version @@ -222,6 +223,7 @@ typedef enum { # define ERL_NIF_API_FUNC_DECL(RET_TYPE, NAME, ARGS) RET_TYPE (*NAME) ARGS typedef struct { # include "erl_nif_api_funcs.h" + void* erts_alc_test; } TWinDynNifCallbacks; extern TWinDynNifCallbacks WinDynNifCallbacks; # undef ERL_NIF_API_FUNC_DECL |