diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-06-24 08:48:14 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-06-24 08:48:14 -0700 |
| commit | d13794332c13737f978b8b4fd56c82ea90c3c2ba (patch) | |
| tree | 10380b60055fa4773141161d6527d06e64561fdb /src/core/iomgr/pollset_posix.h | |
| parent | 98bf7e6517aa6977a1d7be459143c13e28eb5e3c (diff) | |
| parent | 85bc52e38a5d2b89e66850d83c91c9c1d4969091 (diff) | |
Merge github.com:grpc/grpc into oops-i-split-it-again
Diffstat (limited to 'src/core/iomgr/pollset_posix.h')
| -rw-r--r-- | src/core/iomgr/pollset_posix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h index ba3d638d41..53585a2886 100644 --- a/src/core/iomgr/pollset_posix.h +++ b/src/core/iomgr/pollset_posix.h @@ -68,8 +68,8 @@ typedef struct grpc_pollset { struct grpc_pollset_vtable { void (*add_fd)(grpc_pollset *pollset, struct grpc_fd *fd); void (*del_fd)(grpc_pollset *pollset, struct grpc_fd *fd); - int (*maybe_work)(grpc_pollset *pollset, gpr_timespec deadline, - gpr_timespec now, int allow_synchronous_callback); + void (*maybe_work)(grpc_pollset *pollset, gpr_timespec deadline, + gpr_timespec now, int allow_synchronous_callback); void (*kick)(grpc_pollset *pollset); void (*finish_shutdown)(grpc_pollset *pollset); void (*destroy)(grpc_pollset *pollset); |