diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-02 16:55:54 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-02 16:55:54 -0700 |
| commit | a4b89fed1c801cdb31a154c7e1c09e5650898e8a (patch) | |
| tree | d0a00563db8df1da5d69dee362664a85112f20cb /src/core/iomgr/endpoint_pair.h | |
| parent | aaa03d74ceae4d48e31f4ba0619e359acd21505a (diff) | |
| parent | c86b1dd59d1e61b9377f2dca0741061b2e5de1da (diff) | |
Merge github.com:grpc/grpc into you-complete-me
Conflicts:
src/core/iomgr/resolve_address_posix.c
src/core/surface/server.c
Diffstat (limited to 'src/core/iomgr/endpoint_pair.h')
| -rw-r--r-- | src/core/iomgr/endpoint_pair.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/iomgr/endpoint_pair.h b/src/core/iomgr/endpoint_pair.h index dffbd36d4c..25087be0c7 100644 --- a/src/core/iomgr/endpoint_pair.h +++ b/src/core/iomgr/endpoint_pair.h @@ -41,6 +41,7 @@ typedef struct { grpc_endpoint *server; } grpc_endpoint_pair; -grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(size_t read_slice_size); +grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, + size_t read_slice_size); #endif /* GRPC_INTERNAL_CORE_IOMGR_ENDPOINT_PAIR_H */ |