diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-11-30 17:47:36 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-11-30 17:47:36 -0800 |
| commit | 36522e9f8008cade840b75f53164602719577bc6 (patch) | |
| tree | dad5fcaa9e6e23923da427fbe36d7dbd6f288ba3 /src/core/ext/filters/deadline | |
| parent | ede1b2703d4058578b8b5830f006c89c9216521b (diff) | |
| parent | 74a53c2440823e7b53741edba883ff1f4fb8f23a (diff) | |
Merge master after no Extern C changes
Diffstat (limited to 'src/core/ext/filters/deadline')
| -rw-r--r-- | src/core/ext/filters/deadline/deadline_filter.cc | 4 | ||||
| -rw-r--r-- | src/core/ext/filters/deadline/deadline_filter.h | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/core/ext/filters/deadline/deadline_filter.cc b/src/core/ext/filters/deadline/deadline_filter.cc index 7e7af7f7c0..c430f3d2d4 100644 --- a/src/core/ext/filters/deadline/deadline_filter.cc +++ b/src/core/ext/filters/deadline/deadline_filter.cc @@ -364,7 +364,7 @@ static bool maybe_add_deadline_filter(grpc_channel_stack_builder* builder, : true; } -extern "C" void grpc_deadline_filter_init(void) { +void grpc_deadline_filter_init(void) { grpc_channel_init_register_stage( GRPC_CLIENT_DIRECT_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, maybe_add_deadline_filter, (void*)&grpc_client_deadline_filter); @@ -373,4 +373,4 @@ extern "C" void grpc_deadline_filter_init(void) { maybe_add_deadline_filter, (void*)&grpc_server_deadline_filter); } -extern "C" void grpc_deadline_filter_shutdown(void) {} +void grpc_deadline_filter_shutdown(void) {} diff --git a/src/core/ext/filters/deadline/deadline_filter.h b/src/core/ext/filters/deadline/deadline_filter.h index 0998614db3..4de817ef54 100644 --- a/src/core/ext/filters/deadline/deadline_filter.h +++ b/src/core/ext/filters/deadline/deadline_filter.h @@ -20,10 +20,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/iomgr/timer.h" -#ifdef __cplusplus -extern "C" { -#endif - typedef enum grpc_deadline_timer_state { GRPC_DEADLINE_STATE_INITIAL, GRPC_DEADLINE_STATE_PENDING, @@ -92,8 +88,4 @@ bool grpc_deadline_checking_enabled(const grpc_channel_args* args); extern const grpc_channel_filter grpc_client_deadline_filter; extern const grpc_channel_filter grpc_server_deadline_filter; -#ifdef __cplusplus -} -#endif - #endif /* GRPC_CORE_EXT_FILTERS_DEADLINE_DEADLINE_FILTER_H */ |