diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-10-14 14:40:04 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-10-14 14:40:04 +0200 |
| commit | c11ef50378fd68d43fe40b21489493f0e9865626 (patch) | |
| tree | e581e3e0ab672938766b37c411d4561e2cadf509 /erts/emulator/beam/beam_emu.c | |
| parent | b95bfc6c641a568f6ed5dc4ff9e80a742505744d (diff) | |
| parent | 77eba492997f8340425d0828835c2a60cf81550e (diff) | |
| download | otp-c11ef50378fd68d43fe40b21489493f0e9865626.tar.gz otp-c11ef50378fd68d43fe40b21489493f0e9865626.tar.bz2 otp-c11ef50378fd68d43fe40b21489493f0e9865626.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index da36c4437e..78ab6fa30f 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -5654,7 +5654,6 @@ build_stacktrace(Process* c_p, Eterm exc) { return res; } - static BeamInstr* call_error_handler(Process* p, BeamInstr* fi, Eterm* reg, Eterm func) { @@ -5702,7 +5701,6 @@ call_error_handler(Process* p, BeamInstr* fi, Eterm* reg, Eterm func) return ep->addressv[erts_active_code_ix()]; } - static Export* apply_setup_error_handler(Process* p, Eterm module, Eterm function, Uint arity, Eterm* reg) { @@ -6208,7 +6206,6 @@ new_fun(Process* p, Eterm* reg, ErlFunEntry* fe, int num_free) return make_fun(funp); } - int catchlevel(Process *p) { |