diff options
| author | Sverker Eriksson <[email protected]> | 2016-03-01 14:44:50 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-03-01 14:44:50 +0100 |
| commit | 59a0f98dd954b15fda9b2c96878163ffdfff30d1 (patch) | |
| tree | 5ba6370d734f1b9389f465cbccfc83d4104b3ac6 /erts/emulator/beam/erl_nif.c | |
| parent | aa74dd15c39d6b859456aafd78d435763436725d (diff) | |
| parent | 03743cd4193a2ca97f9b9a52a25e63f616e8fc07 (diff) | |
| download | otp-59a0f98dd954b15fda9b2c96878163ffdfff30d1.tar.gz otp-59a0f98dd954b15fda9b2c96878163ffdfff30d1.tar.bz2 otp-59a0f98dd954b15fda9b2c96878163ffdfff30d1.zip | |
Merge branch 'sverk/master/halt-INT_MIN'
* sverk/master/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 2204231748..8580bc2689 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -331,7 +331,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 } |