diff options
| author | Sverker Eriksson <[email protected]> | 2011-04-27 18:02:08 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-04-27 18:02:08 +0200 |
| commit | 317452247f37133f27d9e4e8040269dbccedb268 (patch) | |
| tree | dcc8acd50269f4776ba322689268311b7203768a /erts/emulator/beam/erl_nif.h | |
| parent | 574de87663ecee7043df1783e7c3b830193b0399 (diff) | |
| parent | b02f03c979cda37e43828cd6e1787649f1d8ca8c (diff) | |
| download | otp-317452247f37133f27d9e4e8040269dbccedb268.tar.gz otp-317452247f37133f27d9e4e8040269dbccedb268.tar.bz2 otp-317452247f37133f27d9e4e8040269dbccedb268.zip | |
Merge branch 'sverker/enif_is_exception/OTP-9150' into dev
* sverker/enif_is_exception/OTP-9150:
add support for checking if an ERL_NIF_TERM is an exception
Diffstat (limited to 'erts/emulator/beam/erl_nif.h')
| -rw-r--r-- | erts/emulator/beam/erl_nif.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h index 8050b3640a..d028567faf 100644 --- a/erts/emulator/beam/erl_nif.h +++ b/erts/emulator/beam/erl_nif.h @@ -31,9 +31,10 @@ ** 1.0: R13B04 ** 2.0: R14A ** 2.1: R14B02 "vm_variant" +** 2.2: R14B03 enif_is_exception */ #define ERL_NIF_MAJOR_VERSION 2 -#define ERL_NIF_MINOR_VERSION 1 +#define ERL_NIF_MINOR_VERSION 2 #include <stdlib.h> |