diff options
| author | Björn Gustavsson <[email protected]> | 2010-08-20 08:26:21 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-08-20 08:26:21 +0200 |
| commit | b709d5626e6b7f3df869ecf7aefa5158cbbac70c (patch) | |
| tree | f6f7ff8b0cb0a081f883e6b7db725ebd3b3e4355 /erts/emulator/beam/global.h | |
| parent | 5d50784c2700c30c9b4e651f3732e1fc5a7250d4 (diff) | |
| parent | 1abdce9f382edd044142fe2a9b2a2dd02ff85225 (diff) | |
| download | otp-b709d5626e6b7f3df869ecf7aefa5158cbbac70c.tar.gz otp-b709d5626e6b7f3df869ecf7aefa5158cbbac70c.tar.bz2 otp-b709d5626e6b7f3df869ecf7aefa5158cbbac70c.zip | |
Merge branch 'bjorn/remove-elib_malloc/OTP-8764' into dev
* bjorn/remove-elib_malloc/OTP-8764:
erts: Remove broken elib_malloc
erts: Remove the unused mem_drv driver
erts: Remove stray pre-ISO-C compatibility macros
erts: Remove unused decl.h
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 064dc69da8..280421952e 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -1026,7 +1026,7 @@ void print_pass_through(int, byte*, int); /* beam_emu.c */ int catchlevel(Process*); -void init_emulator(_VOID_); +void init_emulator(void); void process_main(void); Eterm build_stacktrace(Process* c_p, Eterm exc); Eterm expand_error_value(Process* c_p, Uint freason, Eterm Value); @@ -1686,7 +1686,7 @@ int io_list_to_buf(Eterm, char*, int); int io_list_to_buf2(Eterm, char*, int); int io_list_len(Eterm); int is_string(Eterm); -void erl_at_exit(FUNCTION(void,(*),(void*)), void*); +void erl_at_exit(void (*) (void*), void*); Eterm collect_memory(Process *); void dump_memory_to_fd(int); int dump_memory_data(const char *); |