diff options
| author | Rickard Green <[email protected]> | 2015-03-26 12:16:16 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-26 12:16:16 +0100 |
| commit | 29ed0766068fbf960651c3f4d1f73281304dd546 (patch) | |
| tree | 70c9f75ba131f21c3fda6d3684eee070bc027668 /erts/emulator/sys/win32 | |
| parent | 26eba549b2adc29bab37a5edd7aa96b42399936e (diff) | |
| parent | 2e016f6cde89bf471269c89f0fd2bb40422ce204 (diff) | |
| download | otp-29ed0766068fbf960651c3f4d1f73281304dd546.tar.gz otp-29ed0766068fbf960651c3f4d1f73281304dd546.tar.bz2 otp-29ed0766068fbf960651c3f4d1f73281304dd546.zip | |
Merge branch 'rickard/time_api/OTP-11997'
* rickard/time_api/OTP-11997:
Misc fixes
Conflicts:
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
Diffstat (limited to 'erts/emulator/sys/win32')
| -rw-r--r-- | erts/emulator/sys/win32/sys_time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/win32/sys_time.c b/erts/emulator/sys/win32/sys_time.c index 7fe61084ce..b292d9279e 100644 --- a/erts/emulator/sys/win32/sys_time.c +++ b/erts/emulator/sys/win32/sys_time.c @@ -302,7 +302,7 @@ sys_init_time(ErtsSysInitTimeResult *init_resp) internal_state.w.f.last_tick_count = 0; init_resp->os_monotonic_time_info.func = "GetTickCount"; - init_resp->os_monotonic_time_info.locked_use = 1; + init_resp->os_monotonic_time_info.locked_use = 0; /* 10-16 ms resolution according to MicroSoft documentation */ init_resp->os_monotonic_time_info.resolution = 100; /* 10 ms */ time_unit = (ErtsMonotonicTime) 1000; |