diff options
author | Lukas Larsson <lukas@erlang-solutions.com> | 2012-06-04 11:51:03 +0200 |
---|---|---|
committer | Lukas Larsson <lukas@erlang-solutions.com> | 2012-06-04 11:59:03 +0200 |
commit | 0374be0e7caf06a9d1af3daef2cea1f7b20a57ab (patch) | |
tree | 23385b33daa358eaf0a7dc290257f82207d412c9 /erts/emulator/beam/erl_fun.h | |
parent | 868f5446c1f133cc29fc2ef274697460886374c6 (diff) | |
parent | 9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc (diff) | |
download | otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.tar.gz otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.tar.bz2 otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.zip |
Merge branch 'maint'
* maint:
Remove stale code for hybrid heap and incremental GC
Remove the hipe_bifs:show_message_area/0 BIF
Remove support for erlang:system_info(global_heaps_size)
Remove the erlang:garbage_collect_message_area/0 BIF
Remove workarounds for hybrid and shared heaps in test suites
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/beam/erl_message.c
erts/emulator/beam/erl_process.c
erts/emulator/beam/erl_process.h
erts/emulator/hipe/hipe_bif2.tab
lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'erts/emulator/beam/erl_fun.h')
-rw-r--r-- | erts/emulator/beam/erl_fun.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_fun.h b/erts/emulator/beam/erl_fun.h index 6023fa0448..217066ab11 100644 --- a/erts/emulator/beam/erl_fun.h +++ b/erts/emulator/beam/erl_fun.h @@ -54,9 +54,7 @@ typedef struct erl_fun_entry { typedef struct erl_fun_thing { Eterm thing_word; /* Subtag FUN_SUBTAG. */ ErlFunEntry* fe; /* Pointer to fun entry. */ -#ifndef HYBRID /* FIND ME! */ struct erl_off_heap_header* next; -#endif #ifdef HIPE UWord* native_address; /* Native code for the fun. */ #endif @@ -81,9 +79,7 @@ ErlFunEntry* erts_put_fun_entry2(Eterm mod, int old_uniq, int old_index, byte* uniq, int index, int arity); void erts_erase_fun_entry(ErlFunEntry* fe); -#ifndef HYBRID /* FIND ME! */ void erts_cleanup_funs(ErlFunThing* funp); -#endif void erts_cleanup_funs_on_purge(BeamInstr* start, BeamInstr* end); void erts_dump_fun_entries(int, void *); |