diff options
| author | Sverker Eriksson <[email protected]> | 2016-12-05 19:16:48 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-12-05 19:16:48 +0100 |
| commit | 57e0fb97e74c48c502b2eb35990abf4396e04b52 (patch) | |
| tree | f7ebaa2f0acff560d7cebf2934f4994d252bc06c /erts/emulator/beam/erl_nif.c | |
| parent | df2f089ad064f502b8797f53640acdc46187862c (diff) | |
| parent | 6c76bfa96c12b9f29e66baf3a2df7e84bb9b05ef (diff) | |
| download | otp-57e0fb97e74c48c502b2eb35990abf4396e04b52.tar.gz otp-57e0fb97e74c48c502b2eb35990abf4396e04b52.tar.bz2 otp-57e0fb97e74c48c502b2eb35990abf4396e04b52.zip | |
Merge branch 'sverker/secret-atom'
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index 202f713f67..5499512dd1 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -3341,11 +3341,8 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2) mod_atom, f->name, f->arity); #endif } -#ifdef ERTS_DIRTY_SCHEDULERS - else if (erts_codeinfo_to_code(ci_pp[1]) - erts_codeinfo_to_code(ci_pp[0]) < (4)) -#else - else if (erts_codeinfo_to_code(ci_pp[1]) - erts_codeinfo_to_code(ci_pp[0]) < (3)) -#endif + else if (erts_codeinfo_to_code(ci_pp[1]) - erts_codeinfo_to_code(ci_pp[0]) + < BEAM_NIF_MIN_FUNC_SZ) { ret = load_nif_error(BIF_P,bad_lib,"No explicit call to load_nif" " in module (%T:%s/%u too small)", |