diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-12 00:27:00 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-12 00:27:00 +0000 |
| commit | 6b9a99c58d93cef4e538b9f33c68534e2a972505 (patch) | |
| tree | 52b37c364df4d74b8fae769c559415ef4f900cce /src/core/lib/iomgr/pollset.h | |
| parent | 513daab34b6761986237f81793be7627e1fcf77a (diff) | |
| parent | 2ac511f44c000fd73951ddd268a4c86d76665e1b (diff) | |
Merge github.com:grpc/grpc into epexinf
Diffstat (limited to 'src/core/lib/iomgr/pollset.h')
| -rw-r--r-- | src/core/lib/iomgr/pollset.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/pollset.h b/src/core/lib/iomgr/pollset.h index 28d63949ea..799fae154c 100644 --- a/src/core/lib/iomgr/pollset.h +++ b/src/core/lib/iomgr/pollset.h @@ -75,8 +75,8 @@ void grpc_pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset); pollset lock */ grpc_error *grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_pollset_worker **worker, gpr_timespec now, - gpr_timespec deadline) GRPC_MUST_USE_RESULT; + grpc_pollset_worker **worker, + grpc_millis deadline) GRPC_MUST_USE_RESULT; /* Break one polling thread out of polling work for this pollset. If specific_worker is non-NULL, then kick that worker. */ |