aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/beam_load.h
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-11-17 09:52:12 +0100
committerBjörn Gustavsson <[email protected]>2011-11-17 09:52:12 +0100
commitab75301714c3183172e3d315437ed2d62d735c4e (patch)
tree59b6a520961a6e6bacb05a48c58d62d8509f067b /erts/emulator/beam/beam_load.h
parent8e8fa01525dabf757009054798569aba115d2952 (diff)
parentbee543c25be70380be225021864a079c01b56255 (diff)
downloadotp-ab75301714c3183172e3d315437ed2d62d735c4e.tar.gz
otp-ab75301714c3183172e3d315437ed2d62d735c4e.tar.bz2
otp-ab75301714c3183172e3d315437ed2d62d735c4e.zip
Merge branch 'bjorn/erts/code-loading/OTP-9720'
* bjorn/erts/code-loading/OTP-9720: BEAM loader: Don't stop other schedulers until truly needed BEAM loader: Refactor code loading into separate functions beam_load.c: Factor out cleaning up of the loader state into free_state() BEAM loader: Clean up handling of error reasons Remove the useless -l option beam_load.c: Simplify handling of the bs_put_string_II instruction beam_load.c: Remove the unused struct LoadedCode
Diffstat (limited to 'erts/emulator/beam/beam_load.h')
-rw-r--r--erts/emulator/beam/beam_load.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_load.h b/erts/emulator/beam/beam_load.h
index 9d4a60fed1..126d9a3935 100644
--- a/erts/emulator/beam/beam_load.h
+++ b/erts/emulator/beam/beam_load.h
@@ -23,7 +23,9 @@
#include "beam_opcodes.h"
#include "erl_process.h"
-int beam_make_current_old(Process *c_p, ErtsProcLocks c_p_locks, Eterm module);
+Eterm beam_make_current_old(Process *c_p, ErtsProcLocks c_p_locks,
+ Eterm module);
+
typedef struct gen_op_entry {
char* name;