diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-10-19 14:44:53 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-10-19 14:44:53 -0700 |
| commit | 9ea0f2c6e8c97d479c26dad33240ed7d0a258185 (patch) | |
| tree | 3a317b80382377184f120797b74507ff301c4613 /include | |
| parent | 6952b213b7e55426a965d2c58b03f6f86eb598c9 (diff) | |
| parent | 70ee74c4798afe781788d40afe1923feff37d657 (diff) | |
Merge github.com:grpc/grpc into buffer_pools_for_realsies
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/impl/codegen/grpc_types.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index 3492bf741c..c04c2cfa59 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -202,9 +202,11 @@ typedef struct { /** If non-zero, allow the use of SO_REUSEPORT if it's available (default 1) */ #define GRPC_ARG_ALLOW_REUSEPORT "grpc.so_reuseport" /** If non-zero, a pointer to a buffer pool (use grpc_resource_quota_arg_vtable - to - fetch an appropriate pointer arg vtable */ + to fetch an appropriate pointer arg vtable */ #define GRPC_ARG_BUFFER_POOL "grpc.resource_quota" +/** Service config data, to be passed to subchannels. + Not intended for external use. */ +#define GRPC_ARG_SERVICE_CONFIG "grpc.service_config" /** \} */ /** Result of a grpc call. If the caller satisfies the prerequisites of a |