diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2010-12-29 15:48:39 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2010-12-29 15:48:39 +0100 |
| commit | b35412e5eed93875a9c8c47fc8dec3392947b986 (patch) | |
| tree | 38f9eee54ff34736cc14c4128c3fa1bfcc1e1474 /erts/emulator/sys/vxworks/sys.c | |
| parent | 609e7ade98cb278f890e1d53a65356b4d9f12422 (diff) | |
| parent | e7a56088a38bf79a650659b5b6381f71af75c740 (diff) | |
| download | otp-b35412e5eed93875a9c8c47fc8dec3392947b986.tar.gz otp-b35412e5eed93875a9c8c47fc8dec3392947b986.tar.bz2 otp-b35412e5eed93875a9c8c47fc8dec3392947b986.zip | |
Merge branch 'egil/timer-wheel-min-time/OTP-8990' into dev
* egil/timer-wheel-min-time/OTP-8990:
Teach timer-wheel slots to use double linked lists
Remove timer-thread implementation
Refactor timer interface
Teach timer-wheel to keep min time
Diffstat (limited to 'erts/emulator/sys/vxworks/sys.c')
| -rw-r--r-- | erts/emulator/sys/vxworks/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/vxworks/sys.c b/erts/emulator/sys/vxworks/sys.c index 411b4b37cf..c6e7b65f32 100644 --- a/erts/emulator/sys/vxworks/sys.c +++ b/erts/emulator/sys/vxworks/sys.c @@ -85,7 +85,7 @@ EXTERN_FUNCTION(void, erl_exit, (int n, char*, _DOTS_)); EXTERN_FUNCTION(void, erl_error, (char*, va_list)); EXTERN_FUNCTION(int, driver_interrupt, (int, int)); EXTERN_FUNCTION(void, increment_time, (int)); -EXTERN_FUNCTION(int, next_time, (_VOID_)); +EXTERN_FUNCTION(int, erts_next_time, (_VOID_)); EXTERN_FUNCTION(void, set_reclaim_free_function, (FreeFunction)); EXTERN_FUNCTION(int, erl_mem_info_get, (MEM_PART_STATS *)); EXTERN_FUNCTION(void, erl_crash_dump, (char* file, int line, char* fmt, ...)); |