diff options
| author |  Mark D. Roth <roth@google.com> | 2017-12-01 08:56:25 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-12-01 08:56:25 -0800 |
| commit | e109ddf89f966b1f99290ec15a14ec3859049099 (patch) | |
| tree | d9505ff4cc7e19c87a740cc7d379c47810b19417 /test/core/end2end/fuzzers | |
| parent | c5d0df9e44068b82a9980e4f700ffebfbabc9ed2 (diff) | |
| parent | 44c143c587c219ddae4ec3dbce003c0bd6c6c9e6 (diff) | |
Merge remote-tracking branch 'upstream/master' into server_connection_timeout
Diffstat (limited to 'test/core/end2end/fuzzers')
| -rw-r--r-- | test/core/end2end/fuzzers/api_fuzzer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index d84f8a31fa..75117218e4 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -56,7 +56,7 @@ static grpc_server* g_server; static grpc_channel* g_channel; static grpc_resource_quota* g_resource_quota; -extern "C" gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type); +extern gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type); static gpr_timespec now_impl(gpr_clock_type clock_type) { GPR_ASSERT(clock_type != GPR_TIMESPAN); @@ -441,7 +441,7 @@ grpc_ares_request* my_dns_lookup_ares( // client connection // defined in tcp_client_posix.c -extern "C" void (*grpc_tcp_client_connect_impl)( +extern void (*grpc_tcp_client_connect_impl)( grpc_exec_ctx* exec_ctx, grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline); |