diff options
| author | Sverker Eriksson <[email protected]> | 2016-03-01 14:30:34 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-03-01 14:30:34 +0100 |
| commit | e1489c448b7486cdcfec6a89fea238d88e6ce2f3 (patch) | |
| tree | e51068d8358245f5bc1726aec7130b9ff801b093 /erts/emulator/beam/erl_nif.c | |
| parent | 75bc5bebc070a59535b8f6b7b9085c210b4723b5 (diff) | |
| parent | 1b094d72ffc56069c72f17c7edd673dbbfe47e39 (diff) | |
| download | otp-e1489c448b7486cdcfec6a89fea238d88e6ce2f3.tar.gz otp-e1489c448b7486cdcfec6a89fea238d88e6ce2f3.tar.bz2 otp-e1489c448b7486cdcfec6a89fea238d88e6ce2f3.zip | |
Merge branch 'sverk/halt-INT_MIN' into maint
OTP-13251
* sverk/halt-INT_MIN:
erts: Make erlang:halt() accept bignums as Status
erts: Change erl_exit into erts_exit
kernel: Remove calls to erl_exit
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index 3141b05e2b..1097916c97 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -330,7 +330,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid, #ifdef ERTS_SMP c_p = NULL; #else - erl_exit(ERTS_ABORT_EXIT,"enif_send: env==NULL on non-SMP VM"); + erts_exit(ERTS_ABORT_EXIT,"enif_send: env==NULL on non-SMP VM"); #endif } |