diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-19 15:35:17 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-19 15:35:17 -0700 |
| commit | b4e70366c6b25d1127e66fd28c6256b19467dd9b (patch) | |
| tree | 7f51ee747a9ed1200899b1c3e19752d85ce878ed /src/core/surface/server.c | |
| parent | d82d0b295b51e1385481be381eef325423441a65 (diff) | |
| parent | 0c2f1626c0082ab91aed27f77bbe01008d878db2 (diff) | |
Merge branch 'decompression' of https://github.com/dgquintas/grpc into dgquintas-decompression
Conflicts:
Makefile
vsprojects/Grpc.mak
Diffstat (limited to 'src/core/surface/server.c')
| -rw-r--r-- | src/core/surface/server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/surface/server.c b/src/core/surface/server.c index fa120088e1..f2d6b11bc7 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -739,9 +739,9 @@ void grpc_server_register_completion_queue(grpc_server *server, server->cqs[n] = cq; } -grpc_server *grpc_server_create_from_filters(grpc_channel_filter **filters, - size_t filter_count, - const grpc_channel_args *args) { +grpc_server *grpc_server_create_from_filters( + const grpc_channel_filter **filters, size_t filter_count, + const grpc_channel_args *args) { size_t i; /* TODO(census): restore this once we finalize census filter etc. int census_enabled = grpc_channel_args_is_census_enabled(args); */ |