aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_nif.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-01-14 18:22:34 +0100
committerBjörn-Egil Dahlberg <[email protected]>2014-01-29 11:08:44 +0100
commitb8a7203f04a1ed6d2756e6b782cd4c95a8c7c491 (patch)
tree599a15401a416628dd7dc16ae98df0158f74c6ce /erts/emulator/beam/erl_nif.c
parentc8ecb6962a923ceb0b7e599d22adef773d042e4a (diff)
downloadotp-b8a7203f04a1ed6d2756e6b782cd4c95a8c7c491.tar.gz
otp-b8a7203f04a1ed6d2756e6b782cd4c95a8c7c491.tar.bz2
otp-b8a7203f04a1ed6d2756e6b782cd4c95a8c7c491.zip
erts: Increase version for NIF API and reject experimental v2.5
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
-rw-r--r--erts/emulator/beam/erl_nif.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 1a539c730f..1eca7822eb 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -1996,7 +1996,8 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2)
ret = load_nif_error(BIF_P, bad_lib, "Library init-call unsuccessful");
}
else if (entry->major != ERL_NIF_MAJOR_VERSION
- || entry->minor > ERL_NIF_MINOR_VERSION) {
+ || entry->minor > ERL_NIF_MINOR_VERSION
+ || (entry->major==2 && entry->minor == 5)) { /* experimental maps */
ret = load_nif_error(BIF_P, bad_lib, "Library version (%d.%d) not compatible (with %d.%d).",
entry->major, entry->minor, ERL_NIF_MAJOR_VERSION, ERL_NIF_MINOR_VERSION);