diff options
| author | Sverker Eriksson <[email protected]> | 2013-02-13 19:14:37 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-02-13 19:15:13 +0100 |
| commit | aabb9531d01fd414998115409d489c02b7761c9a (patch) | |
| tree | b402eaf982bb5f1adf248ed0187b2e6b1a44cd03 /erts/emulator/beam/erl_nif.h | |
| parent | 33168981eda974653471b13e328fa2a9d3c9d9f3 (diff) | |
| parent | ef3566f48e08481821eee1c7260cdd4ca05fdefc (diff) | |
| download | otp-aabb9531d01fd414998115409d489c02b7761c9a.tar.gz otp-aabb9531d01fd414998115409d489c02b7761c9a.tar.bz2 otp-aabb9531d01fd414998115409d489c02b7761c9a.zip | |
Merge branch 'sverk/nif-cut-timeslice'
* sverk/nif-cut-timeslice:
erts: Add enif_consume_timeslice
OTP-10810
Diffstat (limited to 'erts/emulator/beam/erl_nif.h')
| -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 93e56332e1..62aebcab6c 100644 --- a/erts/emulator/beam/erl_nif.h +++ b/erts/emulator/beam/erl_nif.h @@ -32,10 +32,11 @@ ** 2.0: R14A ** 2.1: R14B02 "vm_variant" ** 2.2: R14B03 enif_is_exception -** 2.3: R15 enif_make_reverse_list +** 2.3: R15 enif_make_reverse_list, enif_is_number +** 2.4: R16 enif_consume_timeslice */ #define ERL_NIF_MAJOR_VERSION 2 -#define ERL_NIF_MINOR_VERSION 3 +#define ERL_NIF_MINOR_VERSION 4 #include <stdlib.h> |