diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
| commit | 8b791a4a7f784fb367af6e56c2596c578e974338 (patch) | |
| tree | ab7baa05c08aeac191768fadc766866434beb36b /src/core/iomgr/timer_heap.h | |
| parent | c357749b48720e00bce57c26acb2195047d63263 (diff) | |
| parent | b47eab53dec9a6d811ad26e0873dc7ec1bac7d46 (diff) | |
Merged from master and resolved merge conflicts
Diffstat (limited to 'src/core/iomgr/timer_heap.h')
| -rw-r--r-- | src/core/iomgr/timer_heap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/iomgr/timer_heap.h b/src/core/iomgr/timer_heap.h index cd5258f93e..2d220f1677 100644 --- a/src/core/iomgr/timer_heap.h +++ b/src/core/iomgr/timer_heap.h @@ -38,8 +38,8 @@ typedef struct { grpc_timer **timers; - gpr_uint32 timer_count; - gpr_uint32 timer_capacity; + uint32_t timer_count; + uint32_t timer_capacity; } grpc_timer_heap; /* return 1 if the new timer is the first timer in the heap */ |