diff options
| author | Rickard Green <[email protected]> | 2011-11-29 11:08:05 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-12-02 15:57:18 +0100 |
| commit | c75e442e973cead87cc0cbff1b4550f04cbc0f70 (patch) | |
| tree | 98b33e56a1a001e281198a7d328fc242fd6d31fd /erts/emulator/sys/unix | |
| parent | 0d273c54d93fd0ddf03f98d138f302442a0f65f9 (diff) | |
| download | otp-c75e442e973cead87cc0cbff1b4550f04cbc0f70.tar.gz otp-c75e442e973cead87cc0cbff1b4550f04cbc0f70.tar.bz2 otp-c75e442e973cead87cc0cbff1b4550f04cbc0f70.zip | |
Fix time types
Diffstat (limited to 'erts/emulator/sys/unix')
| -rw-r--r-- | erts/emulator/sys/unix/erl_unix_sys.h | 1 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h index 9a5ed9f5bc..c8fcec8547 100644 --- a/erts/emulator/sys/unix/erl_unix_sys.h +++ b/erts/emulator/sys/unix/erl_unix_sys.h @@ -146,6 +146,7 @@ typedef void *GETENV_STATE; /* ** For the erl_timer_sup module. */ +typedef time_t erts_time_t; typedef struct timeval SysTimeval; diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index c6b63350e5..52477467b3 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -265,7 +265,7 @@ struct { int (*event)(ErlDrvPort, ErlDrvEvent, ErlDrvEventData); void (*check_io_as_interrupt)(void); void (*check_io_interrupt)(int); - void (*check_io_interrupt_tmd)(int, long); + void (*check_io_interrupt_tmd)(int, erts_short_time_t); void (*check_io)(int); Uint (*size)(void); Eterm (*info)(void *); @@ -371,7 +371,7 @@ erts_sys_schedule_interrupt(int set) #ifdef ERTS_SMP void -erts_sys_schedule_interrupt_timed(int set, long msec) +erts_sys_schedule_interrupt_timed(int set, erts_short_time_t msec) { ERTS_CHK_IO_INTR_TMD(set, msec); } |