diff options
| author |  Alistair Veitch <aveitch@google.com> | 2016-01-12 17:38:33 -0800 |
|---|---|---|
| committer | Alistair Veitch <aveitch@google.com> | 2016-01-12 17:38:33 -0800 |
| commit | f190601e606fb89158f671bea1676e4083bc9bb4 (patch) | |
| tree | 10fa432bd7c2b794443beb882eb04c6b6b193b84 /src/core/support/sync_win32.c | |
| parent | bb30d2591fc52c5bacc309c107077d92d5afc70a (diff) | |
| parent | 69ff3d3373e985ba7deba11bd854e95623af9b54 (diff) | |
Merge branch 'master' into tag_set
Diffstat (limited to 'src/core/support/sync_win32.c')
| -rw-r--r-- | src/core/support/sync_win32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/support/sync_win32.c b/src/core/support/sync_win32.c index 69dd46399a..51a082b29e 100644 --- a/src/core/support/sync_win32.c +++ b/src/core/support/sync_win32.c @@ -88,9 +88,9 @@ int gpr_cv_wait(gpr_cv *cv, gpr_mu *mu, gpr_timespec abs_deadline) { SleepConditionVariableCS(cv, &mu->cs, INFINITE); } else { gpr_timespec now = gpr_now(abs_deadline.clock_type); - gpr_int64 now_ms = (gpr_int64)now.tv_sec * 1000 + now.tv_nsec / 1000000; - gpr_int64 deadline_ms = - (gpr_int64)abs_deadline.tv_sec * 1000 + abs_deadline.tv_nsec / 1000000; + int64_t now_ms = (int64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000; + int64_t deadline_ms = + (int64_t)abs_deadline.tv_sec * 1000 + abs_deadline.tv_nsec / 1000000; if (now_ms >= deadline_ms) { timeout = 1; } else { |