diff options
author | 2015-07-10 19:48:17 -0700 | |
---|---|---|
committer | 2015-07-10 19:48:17 -0700 | |
commit | a8822999840a7c550692b372ff93841fa43907bd (patch) | |
tree | 0feda344bff960f3331f9f222a4cd0316e5e4099 /src/core/support/sync_win32.c | |
parent | 10a6546cb94373b7d57f3cb2d567edfbb0742d7c (diff) | |
parent | 4547d503d37ade45866688dae3ce291ec8a450bd (diff) |
Merge branch 'master' into lockfree-stack
Diffstat (limited to 'src/core/support/sync_win32.c')
-rw-r--r-- | src/core/support/sync_win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/support/sync_win32.c b/src/core/support/sync_win32.c index 72f39f8d46..29b77fc4c2 100644 --- a/src/core/support/sync_win32.c +++ b/src/core/support/sync_win32.c @@ -86,7 +86,7 @@ int gpr_cv_wait(gpr_cv *cv, gpr_mu *mu, gpr_timespec abs_deadline) { if (gpr_time_cmp(abs_deadline, gpr_inf_future) == 0) { SleepConditionVariableCS(cv, &mu->cs, INFINITE); } else { - gpr_timespec now = gpr_now(); + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); gpr_int64 now_ms = now.tv_sec * 1000 + now.tv_nsec / 1000000; gpr_int64 deadline_ms = abs_deadline.tv_sec * 1000 + abs_deadline.tv_nsec / 1000000; |