Merge pull request #3622 from mjstapp/fix_cpp_compile

libs, daemons: changes to permit c++ compilation

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/if.h b/lib/if.h
index 5b46ed8204..6689769beb 100644
--- a/lib/if.h
+++ b/lib/if.h
@@ -27,6 +27,10 @@
 #include "qobj.h"
 #include "hook.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 DECLARE_MTYPE(IF)
 DECLARE_MTYPE(CONNECTED_LABEL)
 
@@ -290,9 +294,9 @@ struct interface {
 };
 
 RB_HEAD(if_name_head, interface);
-RB_PROTOTYPE(if_name_head, interface, name_entry, if_cmp_func);
+RB_PROTOTYPE(if_name_head, interface, name_entry, if_cmp_func)
 RB_HEAD(if_index_head, interface);
-RB_PROTOTYPE(if_index_head, interface, index_entry, if_cmp_func);
+RB_PROTOTYPE(if_index_head, interface, index_entry, if_cmp_func)
 DECLARE_QOBJ_TYPE(interface)
 
 #define IFNAME_RB_INSERT(vrf, ifp)                                             \
@@ -545,4 +549,8 @@ void if_link_params_free(struct interface *);
 extern void if_cmd_init(void);
 extern const struct frr_yang_module_info frr_interface_info;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ZEBRA_IF_H */