diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-12-12 06:36:43 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-12-12 06:36:43 -0800 |
| commit | b995e8bcdabd5e40bf5384a64ee57e83cc9691ff (patch) | |
| tree | 4c1441e5648faad865e7480d36b063882e9fd77b /test/core/surface | |
| parent | 298d481f1e8348cb7713d53a26fc2c41eb9d8f7c (diff) | |
| parent | b62bffbea5eef106bfbe644e8af161889c927401 (diff) | |
Merge github.com:grpc/grpc into slice_with_exec_ctx
Diffstat (limited to 'test/core/surface')
| -rw-r--r-- | test/core/surface/concurrent_connectivity_test.c | 2 | ||||
| -rw-r--r-- | test/core/surface/public_headers_must_be_c89.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/core/surface/concurrent_connectivity_test.c b/test/core/surface/concurrent_connectivity_test.c index f9f4675454..93a4794222 100644 --- a/test/core/surface/concurrent_connectivity_test.c +++ b/test/core/surface/concurrent_connectivity_test.c @@ -105,8 +105,8 @@ void server_thread(void *vargs) { static void on_connect(grpc_exec_ctx *exec_ctx, void *vargs, grpc_endpoint *tcp, grpc_pollset *accepting_pollset, grpc_tcp_server_acceptor *acceptor) { + gpr_free(acceptor); struct server_thread_args *args = (struct server_thread_args *)vargs; - (void)acceptor; grpc_endpoint_shutdown(exec_ctx, tcp); grpc_endpoint_destroy(exec_ctx, tcp); GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, NULL)); diff --git a/test/core/surface/public_headers_must_be_c89.c b/test/core/surface/public_headers_must_be_c89.c index 610495377c..e0a2c94216 100644 --- a/test/core/surface/public_headers_must_be_c89.c +++ b/test/core/surface/public_headers_must_be_c89.c @@ -43,6 +43,7 @@ #include <grpc/impl/codegen/compression_types.h> #include <grpc/impl/codegen/connectivity_state.h> #include <grpc/impl/codegen/exec_ctx_fwd.h> +#include <grpc/impl/codegen/gpr_slice.h> #include <grpc/impl/codegen/gpr_types.h> #include <grpc/impl/codegen/grpc_types.h> #include <grpc/impl/codegen/port_platform.h> |