diff options
| author | Bruce Yinhe <[email protected]> | 2014-11-07 11:05:48 +0100 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2014-11-07 11:05:48 +0100 |
| commit | 7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e (patch) | |
| tree | d9678549b4a20e0d984d1635cef650f5e9364b6d /erts/emulator/beam | |
| parent | 702739cd0ca57727b4e32006e2a3ac8023c30bcb (diff) | |
| parent | 983a39ab079c9f825d31cfe349588a76824d8ef2 (diff) | |
| download | otp-7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e.tar.gz otp-7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e.tar.bz2 otp-7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 3839d80cc4..d2ee5e4224 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -27,6 +27,7 @@ #include "erl_process.h" #include "error.h" #include "erl_driver.h" +#include "erl_nif.h" #include "bif.h" #include "big.h" #include "erl_version.h" @@ -2462,6 +2463,13 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1) ERL_DRV_EXTENDED_MINOR_VERSION); hp = HAlloc(BIF_P, 2*n); BIF_RET(buf_to_intlist(&hp, buf, n, NIL)); + } else if (ERTS_IS_ATOM_STR("nif_version", BIF_ARG_1)) { + char buf[42]; + int n = erts_snprintf(buf, 42, "%d.%d", + ERL_NIF_MAJOR_VERSION, + ERL_NIF_MINOR_VERSION); + hp = HAlloc(BIF_P, 2*n); + BIF_RET(buf_to_intlist(&hp, buf, n, NIL)); } else if (ERTS_IS_ATOM_STR("smp_support", BIF_ARG_1)) { #ifdef ERTS_SMP BIF_RET(am_true); |