diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-17 08:56:52 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-17 08:56:52 -0700 |
| commit | 5110b8d23bdbcad5cf37314afa256847673625c8 (patch) | |
| tree | 822c59673ca0a17ead70c3a43c5d88957e2afec4 /test/core/util | |
| parent | 642bdbea819825b23e6537f393da4d3c59d42f46 (diff) | |
| parent | c6175eda53a3c75b2ab52295c523cbc2cc6db8e4 (diff) | |
Merge github.com:grpc/grpc into verify
Diffstat (limited to 'test/core/util')
| -rw-r--r-- | test/core/util/BUILD | 17 | ||||
| -rw-r--r-- | test/core/util/debugger_macros.cc (renamed from test/core/util/debugger_macros.c) | 2 | ||||
| -rw-r--r-- | test/core/util/debugger_macros.h | 8 | ||||
| -rw-r--r-- | test/core/util/trickle_endpoint.h | 8 |
4 files changed, 32 insertions, 3 deletions
diff --git a/test/core/util/BUILD b/test/core/util/BUILD index abb50a0c99..5844a17728 100644 --- a/test/core/util/BUILD +++ b/test/core/util/BUILD @@ -32,9 +32,22 @@ grpc_cc_library( ) grpc_cc_library( + name = "grpc_debugger_macros", + srcs = [ + "debugger_macros.cc", + ], + hdrs = [ + "debugger_macros.h", + ], + deps = [ + ":gpr_test_util", + "//:grpc_common", + ], +) + +grpc_cc_library( name = "grpc_test_util_base", srcs = [ - "debugger_macros.c", "grpc_profiler.c", "mock_endpoint.c", "parse_hexstring.c", @@ -47,7 +60,6 @@ grpc_cc_library( "trickle_endpoint.c", ], hdrs = [ - "debugger_macros.h", "grpc_profiler.h", "mock_endpoint.h", "parse_hexstring.h", @@ -63,6 +75,7 @@ grpc_cc_library( deps = [ ":gpr_test_util", "//:grpc_common", + ":grpc_debugger_macros" ], ) diff --git a/test/core/util/debugger_macros.c b/test/core/util/debugger_macros.cc index ebe74f1fd6..72384f2dd7 100644 --- a/test/core/util/debugger_macros.c +++ b/test/core/util/debugger_macros.cc @@ -29,7 +29,7 @@ #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/surface/call.h" -void grpc_summon_debugger_macros() {} +extern "C" void grpc_summon_debugger_macros() {} grpc_stream *grpc_transport_stream_from_call(grpc_call *call) { grpc_call_stack *cs = grpc_call_get_call_stack(call); diff --git a/test/core/util/debugger_macros.h b/test/core/util/debugger_macros.h index c6b3720c5a..24718d9307 100644 --- a/test/core/util/debugger_macros.h +++ b/test/core/util/debugger_macros.h @@ -19,6 +19,14 @@ #ifndef GRPC_TEST_CORE_UTIL_DEBUGGER_MACROS_H #define GRPC_TEST_CORE_UTIL_DEBUGGER_MACROS_H +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + void grpc_summon_debugger_macros(); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* GRPC_TEST_CORE_UTIL_DEBUGGER_MACROS_H */ diff --git a/test/core/util/trickle_endpoint.h b/test/core/util/trickle_endpoint.h index 78f1eeeda2..ca39638ba0 100644 --- a/test/core/util/trickle_endpoint.h +++ b/test/core/util/trickle_endpoint.h @@ -21,6 +21,10 @@ #include "src/core/lib/iomgr/endpoint.h" +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + grpc_endpoint *grpc_trickle_endpoint_create(grpc_endpoint *wrap, double bytes_per_second); @@ -30,4 +34,8 @@ size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx *exec_ctx, size_t grpc_trickle_get_backlog(grpc_endpoint *endpoint); +#ifdef __cplusplus +} +#endif // __cplusplus + #endif |