Merge branch 'rickard/timer-improvements'

OTP-14356

* rickard/timer-improvements:
  Fix of later timer wheel
  Minimum timeout position in each timer wheel
  Manage timers to trigger at once in a slot similar to other timers
  Introduce timer slot range counters
  Timer wheel divided into a "soon wheel" and a "later wheel"
  Remove unnecessary cancel callback from timer-wheel timers
  Rearrange timer struct fields in order to simplify
  Use timer wheel for short BIF timers
  Use magic refs for BIF timers
  Remove accessor BIF timer implementation
  Fix aux-work timer implementation

1 files changed, 2 insertions, 2 deletions

diff --git a/erts/emulator/beam/erl_hl_timer.h b/erts/emulator/beam/erl_hl_timer.h
index 9cdcd581a0..f70fcdd1c0 100644
--- a/erts/emulator/beam/erl_hl_timer.h
+++ b/erts/emulator/beam/erl_hl_timer.h
@@ -21,7 +21,7 @@
 #ifndef ERL_HL_TIMER_H__
 #define ERL_HL_TIMER_H__
 
-typedef struct ErtsHLTimer_ ErtsBifTimers;
+typedef struct ErtsBifTimer_ ErtsBifTimers;
 typedef struct ErtsHLTimerService_ ErtsHLTimerService;
 
 #include "sys.h"
@@ -56,7 +56,7 @@ void erts_cancel_proc_timer(Process *);
 void erts_set_port_timer(Port *, Sint64);
 void erts_cancel_port_timer(Port *);
 Sint64 erts_read_port_timer(Port *);
-int erts_cancel_bif_timers(Process *, ErtsBifTimers *, void **);
+int erts_cancel_bif_timers(Process *, ErtsBifTimers **, void **);
 int erts_detach_accessor_bif_timers(Process *, ErtsBifTimers *, void **);
 ErtsHLTimerService *erts_create_timer_service(void);
 void erts_hl_timer_init(void);