diff options
author | 2016-01-29 11:02:47 -0800 | |
---|---|---|
committer | 2016-01-29 11:02:47 -0800 | |
commit | e464af1a5bcae28a7e3d25be6aa2dc5517d562e8 (patch) | |
tree | 2b4b60035b57c89b3846e065f5bed32b1c942f93 /test/core/surface | |
parent | 55b1b59df68662f59b11a4a625c70fa4e8213d6b (diff) | |
parent | eecd9e2d23261f953c23dd8381b2736e1c0c230e (diff) |
Merge remote-tracking branch 'upstream/master' into stalled_by_transport_race2
Diffstat (limited to 'test/core/surface')
-rw-r--r-- | test/core/surface/lame_client_test.c | 6 | ||||
-rw-r--r-- | test/core/surface/public_headers_must_be_c89.c | 15 |
2 files changed, 18 insertions, 3 deletions
diff --git a/test/core/surface/lame_client_test.c b/test/core/surface/lame_client_test.c index e03cce1322..79e53cb422 100644 --- a/test/core/surface/lame_client_test.c +++ b/test/core/surface/lame_client_test.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -47,13 +47,13 @@ grpc_closure transport_op_cb; static void *tag(intptr_t x) { return (void *)x; } -void verify_connectivity(grpc_exec_ctx *exec_ctx, void *arg, int success) { +void verify_connectivity(grpc_exec_ctx *exec_ctx, void *arg, bool success) { grpc_transport_op *op = arg; GPR_ASSERT(GRPC_CHANNEL_FATAL_FAILURE == *op->connectivity_state); GPR_ASSERT(success); } -void do_nothing(grpc_exec_ctx *exec_ctx, void *arg, int success) {} +void do_nothing(grpc_exec_ctx *exec_ctx, void *arg, bool success) {} void test_transport_op(grpc_channel *channel) { grpc_transport_op op; diff --git a/test/core/surface/public_headers_must_be_c89.c b/test/core/surface/public_headers_must_be_c89.c index 1e1524d098..579faa4441 100644 --- a/test/core/surface/public_headers_must_be_c89.c +++ b/test/core/surface/public_headers_must_be_c89.c @@ -37,6 +37,21 @@ #include <grpc/compression.h> #include <grpc/grpc.h> #include <grpc/grpc_security.h> +#include <grpc/impl/codegen/alloc.h> +#include <grpc/impl/codegen/atm.h> +#include <grpc/impl/codegen/byte_buffer.h> +#include <grpc/impl/codegen/compression_types.h> +#include <grpc/impl/codegen/connectivity_state.h> +#include <grpc/impl/codegen/grpc_types.h> +#include <grpc/impl/codegen/log.h> +#include <grpc/impl/codegen/port_platform.h> +#include <grpc/impl/codegen/propagation_bits.h> +#include <grpc/impl/codegen/slice.h> +#include <grpc/impl/codegen/slice_buffer.h> +#include <grpc/impl/codegen/status.h> +#include <grpc/impl/codegen/sync.h> +#include <grpc/impl/codegen/sync_generic.h> +#include <grpc/impl/codegen/time.h> #include <grpc/status.h> #include <grpc/support/alloc.h> #include <grpc/support/atm.h> |