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/transport | |
| parent | c5d0df9e44068b82a9980e4f700ffebfbabc9ed2 (diff) | |
| parent | 44c143c587c219ddae4ec3dbce003c0bd6c6c9e6 (diff) | |
Merge remote-tracking branch 'upstream/master' into server_connection_timeout
Diffstat (limited to 'test/core/transport')
| -rw-r--r-- | test/core/transport/bdp_estimator_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc index 2a6fa95162..d1272607f2 100644 --- a/test/core/transport/bdp_estimator_test.cc +++ b/test/core/transport/bdp_estimator_test.cc @@ -29,7 +29,7 @@ #include "src/core/lib/support/string.h" #include "test/core/util/test_config.h" -extern "C" gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type); +extern gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type); namespace grpc_core { namespace testing { |