diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-08-26 10:58:17 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-08-26 10:58:17 -0700 |
| commit | c84d4aa6d08770335e1a5debbd2f3daff3897d19 (patch) | |
| tree | 85522ef3c538391da9fc8e40c0b929f00f150c80 /src/core/support/time_win32.c | |
| parent | 1dc323b45e1a109c860806cb25e7eca21c29a3c0 (diff) | |
| parent | 60e0e743bed05b248c485949c6cd9e05fa02b607 (diff) | |
Merge github.com:grpc/grpc into endpoints
Conflicts:
src/core/iomgr/tcp_windows.c
Diffstat (limited to 'src/core/support/time_win32.c')
| -rw-r--r-- | src/core/support/time_win32.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/support/time_win32.c b/src/core/support/time_win32.c index 7f64c80e27..f794855429 100644 --- a/src/core/support/time_win32.c +++ b/src/core/support/time_win32.c @@ -38,6 +38,7 @@ #ifdef GPR_WIN32 #include <grpc/support/time.h> +#include <src/core/support/time_precise.h> #include <sys/timeb.h> static LARGE_INTEGER g_start_time; @@ -68,6 +69,9 @@ gpr_timespec gpr_now(gpr_clock_type clock) { now_tv.tv_sec = (time_t)now_dbl; now_tv.tv_nsec = (int)((now_dbl - (double)now_tv.tv_sec) * 1e9); break; + case GPR_CLOCK_PRECISE: + gpr_precise_clock_now(&now_tv); + break; } return now_tv; } |