aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/common/erl_poll.h
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2011-12-02 16:01:38 +0100
committerPatrik Nyblom <[email protected]>2011-12-02 16:01:45 +0100
commit65ca664c8b01821713da374ae05bb9010b749c06 (patch)
tree98b33e56a1a001e281198a7d328fc242fd6d31fd /erts/emulator/sys/common/erl_poll.h
parent0d273c54d93fd0ddf03f98d138f302442a0f65f9 (diff)
parentc75e442e973cead87cc0cbff1b4550f04cbc0f70 (diff)
downloadotp-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.h')
-rw-r--r--erts/emulator/sys/common/erl_poll.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_poll.h b/erts/emulator/sys/common/erl_poll.h
index e0296c6a33..8dde619105 100644
--- a/erts/emulator/sys/common/erl_poll.h
+++ b/erts/emulator/sys/common/erl_poll.h
@@ -223,7 +223,7 @@ void ERTS_POLL_EXPORT(erts_poll_interrupt)(ErtsPollSet,
int);
void ERTS_POLL_EXPORT(erts_poll_interrupt_timed)(ErtsPollSet,
int,
- long);
+ erts_short_time_t);
ErtsPollEvents ERTS_POLL_EXPORT(erts_poll_control)(ErtsPollSet,
ErtsSysFdType,
ErtsPollEvents,