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/lib/iomgr/pollset_set.h | |
parent | ede1b2703d4058578b8b5830f006c89c9216521b (diff) | |
parent | 74a53c2440823e7b53741edba883ff1f4fb8f23a (diff) |
Merge master after no Extern C changes
Diffstat (limited to 'src/core/lib/iomgr/pollset_set.h')
-rw-r--r-- | src/core/lib/iomgr/pollset_set.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/lib/iomgr/pollset_set.h b/src/core/lib/iomgr/pollset_set.h index 4aa1a5977e..a94d0afe75 100644 --- a/src/core/lib/iomgr/pollset_set.h +++ b/src/core/lib/iomgr/pollset_set.h @@ -21,10 +21,6 @@ #include "src/core/lib/iomgr/pollset.h" -#ifdef __cplusplus -extern "C" { -#endif - /* A grpc_pollset_set is a set of pollsets that are interested in an action. Adding a pollset to a pollset_set automatically adds any fd's (etc) that have been registered with the set_set to that pollset. @@ -43,8 +39,4 @@ void grpc_pollset_set_add_pollset_set(grpc_pollset_set* bag, void grpc_pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item); -#ifdef __cplusplus -} -#endif - #endif /* GRPC_CORE_LIB_IOMGR_POLLSET_SET_H */ |