diff options
| author | Patrik Nyblom <[email protected]> | 2011-12-02 16:01:38 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-12-02 16:01:45 +0100 |
| commit | 65ca664c8b01821713da374ae05bb9010b749c06 (patch) | |
| tree | 98b33e56a1a001e281198a7d328fc242fd6d31fd /erts/emulator/sys/common/erl_poll.c | |
| parent | 0d273c54d93fd0ddf03f98d138f302442a0f65f9 (diff) | |
| parent | c75e442e973cead87cc0cbff1b4550f04cbc0f70 (diff) | |
| download | otp-65ca664c8b01821713da374ae05bb9010b749c06.tar.gz otp-65ca664c8b01821713da374ae05bb9010b749c06.tar.bz2 otp-65ca664c8b01821713da374ae05bb9010b749c06.zip | |
Merge branch 'rickard/time_t'
* rickard/time_t:
Fix time types
OTP-9767
Diffstat (limited to 'erts/emulator/sys/common/erl_poll.c')
| -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 80db2055a2..b6cb271f17 100644 --- a/erts/emulator/sys/common/erl_poll.c +++ b/erts/emulator/sys/common/erl_poll.c @@ -2171,7 +2171,7 @@ ERTS_POLL_EXPORT(erts_poll_async_sig_interrupt)(ErtsPollSet ps) void ERTS_POLL_EXPORT(erts_poll_interrupt_timed)(ErtsPollSet ps, int set, - long msec) + erts_short_time_t msec) { #if ERTS_POLL_ASYNC_INTERRUPT_SUPPORT || defined(ERTS_SMP) if (!set) |