diff options
| author | Marcus Arendt <[email protected]> | 2014-08-28 10:24:59 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-08-28 10:24:59 +0200 |
| commit | dca659f2f5f07b70a18d3e3a1ec0967f3933415e (patch) | |
| tree | cb6db6c1b599fb26c76a617e96a894d489c98d14 /erts | |
| parent | 4a0f4a124d2a7be85e4bf77c58e31344f11f40bd (diff) | |
| parent | ceec6ba5c24ceef3c074afc2b49d8e77c492c0c4 (diff) | |
| download | otp-dca659f2f5f07b70a18d3e3a1ec0967f3933415e.tar.gz otp-dca659f2f5f07b70a18d3e3a1ec0967f3933415e.tar.bz2 otp-dca659f2f5f07b70a18d3e3a1ec0967f3933415e.zip | |
Merge branch 'okeuday/erts-poll-debug-print-fix' into maint
* okeuday/erts-poll-debug-print-fix:
Fix ERTS_POLL_DEBUG_PRINT usage
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/sys/common/erl_poll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c index 0a58a625b2..aa412a20c8 100644 --- a/erts/emulator/sys/common/erl_poll.c +++ b/erts/emulator/sys/common/erl_poll.c @@ -2157,7 +2157,7 @@ ERTS_POLL_EXPORT(erts_poll_wait)(ErtsPollSet ps, #ifdef ERTS_POLL_DEBUG_PRINT erts_printf("Entering erts_poll_wait(), timeout=%d\n", - (int) tv->tv_sec*1000 + tv->tv_usec/1000); + (int) tvp->tv_sec*1000 + tvp->tv_usec/1000); #endif if (ERTS_POLLSET_SET_POLLED_CHK(ps)) { |