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/win32/erl_win_sys.h | |
| parent | 0d273c54d93fd0ddf03f98d138f302442a0f65f9 (diff) | |
| download | otp-c75e442e973cead87cc0cbff1b4550f04cbc0f70.tar.gz otp-c75e442e973cead87cc0cbff1b4550f04cbc0f70.tar.bz2 otp-c75e442e973cead87cc0cbff1b4550f04cbc0f70.zip | |
Fix time types
Diffstat (limited to 'erts/emulator/sys/win32/erl_win_sys.h')
| -rw-r--r-- | erts/emulator/sys/win32/erl_win_sys.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h index d770691026..cf3fb4446f 100644 --- a/erts/emulator/sys/win32/erl_win_sys.h +++ b/erts/emulator/sys/win32/erl_win_sys.h @@ -117,9 +117,20 @@ int erts_check_io_debug(void); #define SYS_CLK_TCK 1000 #define SYS_CLOCK_RESOLUTION 1 +#if SIZEOF_TIME_T != 8 +# error "Unexpected sizeof(time_t)" +#endif + +/* + * gcc uses a 4 byte time_t and vc++ uses an 8 byte time_t. + * Types seen in beam_emu.c *need* to have the same size + * as in the rest of the system... + */ +typedef __int64 erts_time_t; + typedef struct { - long tv_sec; - long tv_usec; + erts_time_t tv_sec; + erts_time_t tv_usec; } SysTimeval; typedef struct { |