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/sys/unix/sys.c | |
| 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/sys/unix/sys.c')
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 400ef6c0ce..af4ab693dc 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -123,8 +123,6 @@ static ErtsSysReportExit *report_exit_transit_list; extern int check_async_ready(void); extern int driver_interrupt(int, int); -/*EXTERN_FUNCTION(void, increment_time, (int));*/ -/*EXTERN_FUNCTION(int, next_time, (_VOID_));*/ extern void do_break(void); extern void erl_sys_args(int*, char**); @@ -221,10 +219,10 @@ static struct fd_data { } *fd_data; /* indexed by fd */ /* static FUNCTION(int, write_fill, (int, char*, int)); unused? */ -static FUNCTION(void, note_child_death, (int, int)); +static void note_child_death(int, int); #if CHLDWTHR -static FUNCTION(void *, child_waiter, (void *)); +static void* child_waiter(void *); #endif /********************* General functions ****************************/ @@ -2562,7 +2560,6 @@ extern Preload pre_loaded[]; void erts_sys_alloc_init(void) { - elib_ensure_initialized(); } void *erts_sys_alloc(ErtsAlcType_t t, void *x, Uint sz) |