diff options
| author | Björn Gustavsson <[email protected]> | 2016-02-26 13:09:07 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-02-26 13:09:07 +0100 |
| commit | 6336e0dda8d668c24412775fb45aa8ad19ac384f (patch) | |
| tree | 2e063c4bd6fdea8a5f3e76738bc96ce6ac8fdaf4 /erts/emulator/beam/code_ix.h | |
| parent | e76103a4549bc25937af5cdccbe43c1683613d07 (diff) | |
| parent | 1703b979ffcbfbe44c9014f28384305fea930511 (diff) | |
| download | otp-6336e0dda8d668c24412775fb45aa8ad19ac384f.tar.gz otp-6336e0dda8d668c24412775fb45aa8ad19ac384f.tar.bz2 otp-6336e0dda8d668c24412775fb45aa8ad19ac384f.zip | |
Merge branch 'bjorn/multiple-load/OTP-13111'
* bjorn/multiple-load/OTP-13111:
code: Add functions that can load multiple modules
Refactor post_beam_load handling
Simplify and robustify code_server:all_loaded/1
Update preloaded modules
Add erl_prim_loader:get_modules/3
Add has_prepared_code_on_load/1 BIF
Allow erlang:finish_loading/1 to load more than one module
beam_load.c: Add a function to check for an on_load function
Diffstat (limited to 'erts/emulator/beam/code_ix.h')
| -rw-r--r-- | erts/emulator/beam/code_ix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/code_ix.h b/erts/emulator/beam/code_ix.h index 5f00b409ef..7a66211a5b 100644 --- a/erts/emulator/beam/code_ix.h +++ b/erts/emulator/beam/code_ix.h @@ -100,7 +100,7 @@ void erts_release_code_write_permission(void); * Must be followed by calls to either "end" and "commit" or "abort" before * code write permission can be released. */ -void erts_start_staging_code_ix(void); +void erts_start_staging_code_ix(int num_new); /* End the staging. * Preceded by "start" and must be followed by "commit". |