diff options
author | Rickard Green <[email protected]> | 2015-03-25 15:35:03 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2015-03-25 15:35:03 +0100 |
commit | c2fb3160dee9ad90783ad993c656177c7963d07c (patch) | |
tree | 4338c2579b45cdd02bf294f88f5ab0cf8cfaa12e /erts/emulator/sys/win32/erl_win_sys.h | |
parent | d6797e9a34df677e82db5ee8b8388fbdf57f09f5 (diff) | |
parent | 24cdb324390d99924af9f66104c0941afb5a7b08 (diff) | |
download | otp-c2fb3160dee9ad90783ad993c656177c7963d07c.tar.gz otp-c2fb3160dee9ad90783ad993c656177c7963d07c.tar.bz2 otp-c2fb3160dee9ad90783ad993c656177c7963d07c.zip |
Merge branch 'rickard/time_api/OTP-11997'
* rickard/time_api/OTP-11997:
Skip not updated test-cases
Fixes and cleanup
Diffstat (limited to 'erts/emulator/sys/win32/erl_win_sys.h')
-rw-r--r-- | erts/emulator/sys/win32/erl_win_sys.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h index 9aeb460720..5181d6b584 100644 --- a/erts/emulator/sys/win32/erl_win_sys.h +++ b/erts/emulator/sys/win32/erl_win_sys.h @@ -193,6 +193,7 @@ ErtsSystemTime erts_os_system_time(void); struct erts_sys_time_read_only_data__ { ErtsMonotonicTime (*os_monotonic_time)(void); + void (*os_times)(ErtsMonotonicTime *, ErtsSystemTime*); ErtsSysHrTime (*sys_hrtime)(void); }; @@ -208,6 +209,8 @@ typedef struct { extern ErtsSysTimeData__ erts_sys_time_data__; ERTS_GLB_INLINE ErtsMonotonicTime erts_os_monotonic_time(void); +ERTS_GLB_INLINE void erts_os_times(ErtsMonotonicTime *, + ErtsSystemTime *); ERTS_GLB_INLINE ErtsSysHrTime erts_sys_hrtime(void); #if ERTS_GLB_INLINE_INCL_FUNC_DEF @@ -218,6 +221,12 @@ erts_os_monotonic_time(void) return (*erts_sys_time_data__.r.o.os_monotonic_time)(); } +ERTS_GLB_INLINE void +erts_os_times(ErtsMonotonicTime *mtimep, ErtsSystemTime *stimep) +{ + return (*erts_sys_time_data__.r.o.os_times)(mtimep, stimep); +} + ERTS_GLB_INLINE ErtsSysHrTime erts_sys_hrtime(void) { |