diff options
| author | Rickard Green <[email protected]> | 2015-03-24 16:56:08 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-24 16:56:08 +0100 |
| commit | 5345727d647ea65b7a0417c87b94cf958ef9ee13 (patch) | |
| tree | bcc1c75102741e9768c88b1481390e40e32586e7 /erts/example | |
| parent | a11cec66e37c039d33091db056c0ae44405043ac (diff) | |
| parent | c20482023b70768bd84d25f1e34dbbc2fe09cf31 (diff) | |
| download | otp-5345727d647ea65b7a0417c87b94cf958ef9ee13.tar.gz otp-5345727d647ea65b7a0417c87b94cf958ef9ee13.tar.bz2 otp-5345727d647ea65b7a0417c87b94cf958ef9ee13.zip | |
Merge branch 'rickard/time_api/OTP-11997'
* rickard/time_api/OTP-11997:
Better OS system time implementation
Documentation adjustments
Fix zero timout timers
erts_sys_hrtime() for lcnt
Better support for poor os monotonic sources
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/example')
| -rw-r--r-- | erts/example/time_compat.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/example/time_compat.erl b/erts/example/time_compat.erl index d582117ceb..90b7fbcc80 100644 --- a/erts/example/time_compat.erl +++ b/erts/example/time_compat.erl @@ -240,6 +240,7 @@ system_info(Item) -> time_offset -> final; NotSupArg when NotSupArg == os_monotonic_time_source; + NotSupArg == os_system_time_source; NotSupArg == start_time -> %% Cannot emulate this... erlang:error(notsup, [NotSupArg]); |