diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-04 08:00:55 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-04 08:00:55 -0700 |
| commit | 29ebc575546481a8bb4d10b9bb6c18c510f349af (patch) | |
| tree | 5b7a9fde57fd4f0de05b07a22f26463870f554ff /src/core/lib/iomgr/timer_generic.h | |
| parent | 0e101ea8a3971f498cea4ac9b41e2a0483fefaa3 (diff) | |
| parent | ad286c35da683ab2e1e60c1d6fd41a75a5c5cf6f (diff) | |
Merge branch 'minimal' into minimal_test
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; |