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/win32/sys_time.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/win32/sys_time.c')
| -rw-r--r-- | erts/emulator/sys/win32/sys_time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/win32/sys_time.c b/erts/emulator/sys/win32/sys_time.c index fc868507cb..e5b9513edc 100644 --- a/erts/emulator/sys/win32/sys_time.c +++ b/erts/emulator/sys/win32/sys_time.c @@ -55,8 +55,8 @@ sys_gettimeofday(SysTimeval *tv) GetSystemTime(&t); SystemTimeToFileTime(&t, &ft); memcpy(&lft, &ft, sizeof(lft)); - tv->tv_usec = (long) ((lft / LL_LITERAL(10)) % LL_LITERAL(1000000)); - tv->tv_sec = (long) ((lft / LL_LITERAL(10000000)) - EPOCH_JULIAN_DIFF); + tv->tv_usec = (erts_time_t) ((lft / LL_LITERAL(10)) % LL_LITERAL(1000000)); + tv->tv_sec = (erts_time_t) ((lft / LL_LITERAL(10000000)) - EPOCH_JULIAN_DIFF); } SysHrTime |