diff options
| author | John Högberg <[email protected]> | 2017-07-06 12:33:39 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-07-06 12:33:39 +0200 |
| commit | 1f1d20a352d16741c272f14dd7d09632eef13509 (patch) | |
| tree | eab34f895460ee92a3ebcbf6e2d813e1384e65e0 /erts/emulator/sys/win32/sys_time.c | |
| parent | af4f81a46d895c8a217c104c874a912073728374 (diff) | |
| parent | 5a537ae41c2295f7f19e4e01fe90acc7585f5b30 (diff) | |
| download | otp-1f1d20a352d16741c272f14dd7d09632eef13509.tar.gz otp-1f1d20a352d16741c272f14dd7d09632eef13509.tar.bz2 otp-1f1d20a352d16741c272f14dd7d09632eef13509.zip | |
Merge branch 'maint'
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 e8c67b3928..88131aaa6a 100644 --- a/erts/emulator/sys/win32/sys_time.c +++ b/erts/emulator/sys/win32/sys_time.c @@ -300,8 +300,8 @@ sys_init_time(ErtsSysInitTimeResult *init_resp) module = GetModuleHandle(kernel_dll_name); if (!module) { get_tick_count: - erts_smp_mtx_init(&internal_state.w.f.mtime_mtx, - "os_monotonic_time"); + erts_smp_mtx_init(&internal_state.w.f.mtime_mtx, "os_monotonic_time", NIL, + ERTS_LOCK_FLAGS_PROPERTY_STATIC | ERTS_LOCK_FLAGS_CATEGORY_GENERIC); internal_state.w.f.wrap = 0; internal_state.w.f.last_tick_count = 0; |