diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-03-21 15:22:21 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-03-21 15:22:21 +0100 |
| commit | 425a75a11ea58125b67ad56f4ed3ca65370a3e72 (patch) | |
| tree | 80fa08785954c031c985557e9179a62c10de8a5d /erts/emulator/beam/erl_nif.c | |
| parent | 3c06b5b3cdde72453d97910889e38e91c1dd4870 (diff) | |
| parent | 78ad5368f520c5fa6400d4f16909b23fe5225255 (diff) | |
| download | otp-425a75a11ea58125b67ad56f4ed3ca65370a3e72.tar.gz otp-425a75a11ea58125b67ad56f4ed3ca65370a3e72.tar.bz2 otp-425a75a11ea58125b67ad56f4ed3ca65370a3e72.zip | |
Merge branch 'master' of git-server:otp
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index 40860e141c..063dba056e 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -2049,8 +2049,10 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2) (entry = erts_sys_ddll_call_nif_init(init_func)) == NULL)) { 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 + else if (entry->major < ERL_NIF_MIN_REQUIRED_MAJOR_VERSION_ON_LOAD + || (ERL_NIF_MAJOR_VERSION < entry->major + || (ERL_NIF_MAJOR_VERSION == entry->major + && ERL_NIF_MINOR_VERSION < entry->minor)) || (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).", |