diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-05 09:04:40 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-05 09:04:40 -0700 |
| commit | 2ce0bfa8b47376aefbfadc5e1b6c5164b88842fe (patch) | |
| tree | 07a5aba2c4af15c7802be49d68054d97ee833375 /src/core/lib/iomgr/timer_generic.h | |
| parent | b1d3dcdb7db540b7dfa2efad269cd56738ff7e79 (diff) | |
| parent | bbcf378192d949c1a81cdae96a584e8e7b453e81 (diff) | |
Merge github.com:grpc/grpc into foo
Diffstat (limited to 'src/core/lib/iomgr/timer_generic.h')
| -rw-r--r-- | src/core/lib/iomgr/timer_generic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/timer_generic.h b/src/core/lib/iomgr/timer_generic.h index 1608dce9fb..c79a431aa0 100644 --- a/src/core/lib/iomgr/timer_generic.h +++ b/src/core/lib/iomgr/timer_generic.h @@ -38,7 +38,7 @@ #include "src/core/lib/iomgr/exec_ctx.h" struct grpc_timer { - gpr_timespec deadline; + gpr_atm deadline; uint32_t heap_index; /* INVALID_HEAP_INDEX if not in heap */ bool pending; struct grpc_timer *next; |