diff options
| author | Rickard Green <[email protected]> | 2015-03-25 15:57:53 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-25 15:57:53 +0100 |
| commit | f5c57ee1130daff8e7fb8bf9ad4f057a019f59f6 (patch) | |
| tree | 2a6f2e4e7a6961d60153466979363fcd9de02d16 /erts/emulator | |
| parent | 7d3a9c237dcc476dfa1a0d6e10cfe6c5e3b8ce44 (diff) | |
| parent | 047811828ebac3c4909b8056b8268205c34b693c (diff) | |
| download | otp-f5c57ee1130daff8e7fb8bf9ad4f057a019f59f6.tar.gz otp-f5c57ee1130daff8e7fb8bf9ad4f057a019f59f6.tar.bz2 otp-f5c57ee1130daff8e7fb8bf9ad4f057a019f59f6.zip | |
Merge branch 'rickard/time_api/OTP-11997'
* rickard/time_api/OTP-11997:
Fix erts_sys_hrtime() fallback
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/sys/unix/sys_time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/unix/sys_time.c b/erts/emulator/sys/unix/sys_time.c index e764607c25..ea021a27cf 100644 --- a/erts/emulator/sys/unix/sys_time.c +++ b/erts/emulator/sys/unix/sys_time.c @@ -790,7 +790,7 @@ erts_os_monotonic_time(void) ErtsSysHrTime erts_sys_hrtime(void) { - return (ErtsSysHrTime) erts_os_system_time(); + return (ErtsSysHrTime) ERTS_MONOTONIC_TO_NSEC(erts_os_system_time()); } #endif |