diff options
| author | Sverker Eriksson <[email protected]> | 2016-11-22 14:52:52 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-11-22 14:52:52 +0100 |
| commit | b62020124b3294be021d0d62073ba34cda1ae742 (patch) | |
| tree | 4c68c8100bcc1d9275bf5cade63bf80286e55b4a /erts/emulator/beam/erl_hl_timer.c | |
| parent | 4683b5c227a238ee27f658bdfe2981c4b69acf09 (diff) | |
| parent | 491cd4c0c0a534ab89c3ebb4c413301c91c7167d (diff) | |
| download | otp-b62020124b3294be021d0d62073ba34cda1ae742.tar.gz otp-b62020124b3294be021d0d62073ba34cda1ae742.tar.bz2 otp-b62020124b3294be021d0d62073ba34cda1ae742.zip | |
Merge branch 'sverker/erts/crash-dump-limit/OTP-14046' into maint
* sverker/erts/crash-dump-limit:
erts: Add env variable ERL_CRASH_DUMP_BYTES
erts: Add ErtsStrToSint64
erts: Refactor crash dumping with cbprintf
erts: Add cbprintf for Callback Printing
erts: Remove unused erl_crash_dump()
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; |