diff options
author | Björn Gustavsson <[email protected]> | 2016-09-15 10:16:28 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2016-09-15 10:16:28 +0200 |
commit | fde238fb52133a6c7a2a3f2a2e16f1c1bef62394 (patch) | |
tree | 0e553f298c23f508975635a121fbf8356c58ab8a /erts/preloaded/src/erts_internal.erl | |
parent | cebef1207eca1cdc8c601b172988a74fd0858efa (diff) | |
parent | 359e05121dab023585715b0e42506afd94f2e1f1 (diff) | |
download | otp-fde238fb52133a6c7a2a3f2a2e16f1c1bef62394.tar.gz otp-fde238fb52133a6c7a2a3f2a2e16f1c1bef62394.tar.bz2 otp-fde238fb52133a6c7a2a3f2a2e16f1c1bef62394.zip |
Merge branch 'bjorn/erts/on_load/ERL-240/OTP-13893' into maint
* bjorn/erts/on_load/ERL-240/OTP-13893:
erts: Add nif_SUITE:t_on_load
erts: Improve nif_SUITE:upgrade test
Don't leak old code when loading a modules with an on_load function
Diffstat (limited to 'erts/preloaded/src/erts_internal.erl')
-rw-r--r-- | erts/preloaded/src/erts_internal.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl index 6229754c8c..6aae5ba38c 100644 --- a/erts/preloaded/src/erts_internal.erl +++ b/erts/preloaded/src/erts_internal.erl @@ -304,7 +304,7 @@ release_literal_area_switch() -> -spec purge_module(Module, Op) -> boolean() when Module :: module(), - Op :: 'prepare' | 'abort' | 'complete'. + Op :: 'prepare' | 'prepare_on_load' | 'abort' | 'complete'. purge_module(_Module, _Op) -> erlang:nif_error(undefined). |