diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-02-27 13:35:41 -0800 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-03-17 15:57:23 -0700 |
| commit | 2c977084c8fec4bc395976338683d1d480bab91e (patch) | |
| tree | cf696a8403371b308a45d02445864159ba527e08 /src/core/lib/iomgr/timer_uv.h | |
| parent | dc6b569d97aa54e987681f869f13acdd9c89834f (diff) | |
| parent | dc720ca6bf27181c040cefcdb298d9dee8bf3058 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
Diffstat (limited to 'src/core/lib/iomgr/timer_uv.h')
| -rw-r--r-- | src/core/lib/iomgr/timer_uv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/timer_uv.h b/src/core/lib/iomgr/timer_uv.h index 13cf8bd4fa..9870cd4a5c 100644 --- a/src/core/lib/iomgr/timer_uv.h +++ b/src/core/lib/iomgr/timer_uv.h @@ -41,7 +41,7 @@ struct grpc_timer { /* This is actually a uv_timer_t*, but we want to keep platform-specific types out of headers */ void *uv_timer; - int triggered; + int pending; }; #endif /* GRPC_CORE_LIB_IOMGR_TIMER_UV_H */ |