diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-04-06 13:09:17 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-04-06 13:09:17 -0700 |
| commit | a6ff103446ef739b5eb11a76dda2f8b230532cd5 (patch) | |
| tree | f0a6bf05ef83081c634cffabd233893d69510d1e /src/core/lib/iomgr/timer_generic.h | |
| parent | 3f182df7de52374e600264af7d76f1f6f73da6b8 (diff) | |
| parent | a956d99978c46027663da22ff758506e83f1b7f5 (diff) | |
Merge branch 'master' into cq_create_api_changes
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; |