diff options
author | Sverker Eriksson <[email protected]> | 2016-11-22 14:57:39 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2016-11-22 14:57:39 +0100 |
commit | 0e2bde208e45bb24ae3d9fcd3db94b93882ecaec (patch) | |
tree | a6334828227fda954756453474429335aca89cd9 /erts/emulator/beam/erl_hl_timer.c | |
parent | 9563cd5b296fe589c8abe357710fbb79bc766d09 (diff) | |
parent | b62020124b3294be021d0d62073ba34cda1ae742 (diff) | |
download | otp-0e2bde208e45bb24ae3d9fcd3db94b93882ecaec.tar.gz otp-0e2bde208e45bb24ae3d9fcd3db94b93882ecaec.tar.bz2 otp-0e2bde208e45bb24ae3d9fcd3db94b93882ecaec.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_hl_timer.c')
-rw-r--r-- | erts/emulator/beam/erl_hl_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c index f1bef28186..d29d079fc5 100644 --- a/erts/emulator/beam/erl_hl_timer.c +++ b/erts/emulator/beam/erl_hl_timer.c @@ -2851,7 +2851,7 @@ erts_read_port_timer(Port *c_prt) */ typedef struct { - int to; + fmtfn_t to; void *to_arg; ErtsMonotonicTime now; } ErtsBTMPrint; @@ -2881,7 +2881,7 @@ btm_print(ErtsHLTimer *tmr, void *vbtmp) } void -erts_print_bif_timer_info(int to, void *to_arg) +erts_print_bif_timer_info(fmtfn_t to, void *to_arg) { ErtsBTMPrint btmp; int six; |