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_bif_ddll.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_bif_ddll.c')
-rw-r--r-- | erts/emulator/beam/erl_bif_ddll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_ddll.c b/erts/emulator/beam/erl_bif_ddll.c index 2b1d875bfe..f006856b6a 100644 --- a/erts/emulator/beam/erl_bif_ddll.c +++ b/erts/emulator/beam/erl_bif_ddll.c @@ -1309,7 +1309,7 @@ static Eterm notify_when_loaded(Process *p, Eterm name_term, char *name, ErtsPro case ERL_DE_FORCE_RELOAD: break; default: - erl_exit(1,"Internal error, unknown state %u in dynamic driver.", drv->handle->status); + erts_exit(ERTS_ERROR_EXIT,"Internal error, unknown state %u in dynamic driver.", drv->handle->status); } p->flags |= F_USING_DDLL; r = add_monitor(p, drv->handle, ERL_DE_PROC_AWAIT_LOAD); |