aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/win32/erl_poll.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2011-11-29 11:08:05 +0100
committerPatrik Nyblom <[email protected]>2011-12-02 15:57:18 +0100
commitc75e442e973cead87cc0cbff1b4550f04cbc0f70 (patch)
tree98b33e56a1a001e281198a7d328fc242fd6d31fd /erts/emulator/sys/win32/erl_poll.c
parent0d273c54d93fd0ddf03f98d138f302442a0f65f9 (diff)
downloadotp-c75e442e973cead87cc0cbff1b4550f04cbc0f70.tar.gz
otp-c75e442e973cead87cc0cbff1b4550f04cbc0f70.tar.bz2
otp-c75e442e973cead87cc0cbff1b4550f04cbc0f70.zip
Fix time types
Diffstat (limited to 'erts/emulator/sys/win32/erl_poll.c')
-rw-r--r--erts/emulator/sys/win32/erl_poll.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/sys/win32/erl_poll.c b/erts/emulator/sys/win32/erl_poll.c
index ab4ef05118..7a1d129cd5 100644
--- a/erts/emulator/sys/win32/erl_poll.c
+++ b/erts/emulator/sys/win32/erl_poll.c
@@ -442,8 +442,8 @@ poll_wait_timeout(ErtsPollSet ps, SysTimeval *tvp)
if (erts_atomic32_read_nob(&ps->wakeup_state) != ERTS_POLL_NOT_WOKEN)
return (DWORD) 0;
- if (timeout > ERTS_AINT32_T_MAX) /* Also prevents DWORD overflow */
- timeout = ERTS_AINT32_T_MAX;
+ if (timeout > ((time_t) ERTS_AINT32_T_MAX))
+ timeout = ERTS_AINT32_T_MAX; /* Also prevents DWORD overflow */
erts_smp_atomic32_set_relb(&ps->timeout, (erts_aint32_t) timeout);
return (DWORD) timeout;
@@ -1012,7 +1012,7 @@ void erts_poll_interrupt(ErtsPollSet ps, int set /* bool */)
void erts_poll_interrupt_timed(ErtsPollSet ps,
int set /* bool */,
- long msec)
+ erts_short_time_t msec)
{
HARDTRACEF(("In erts_poll_interrupt_timed(%d,%ld)",set,msec));
if (!set)