pimd: Make frr able to be built by gcc 10

- Add extern modifier to some declarations in header file and move
qpim_all_pim_routers_addr definition to pimd/pimd.c

`GCC now defaults to -fno-common. As a result, global variable accesses
are more efficient on various targets. In C, global variables with
multiple tentative definitions now result in linker errors.`
Taken from https://gcc.gnu.org/gcc-10/changes.html

Signed-off-by: Tomas Korbar <tkorbar@redhat.com>
(cherry picked from commit 403242d214b6cb919ed08f2149d7bee77a060947)

diff --git a/pimd/pimd.c b/pimd/pimd.c
index 889a83a136bdaec25bc9bf9214c2e3f34b368f18..0a7ac3b31fa306220b60b874c6a6f9df595d9a21 100644 (file)
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -50,6 +50,7 @@ const char *const PIM_ALL_IGMP_ROUTERS = MCAST_ALL_IGMP_ROUTERS;
 DEFINE_MTYPE_STATIC(PIMD, ROUTER, "PIM Router information");
 
 struct pim_router *router = NULL;
+struct in_addr qpim_all_pim_routers_addr;
 
 void pim_prefix_list_update(struct prefix_list *plist)
 {

diff --git a/pimd/pimd.h b/pimd/pimd.h
index 70d276622080c1fb8a40b0618d4588216e296ef3..88e692b50d2c7dc71d36a4f67200862d2970720b 100644 (file)
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@ -131,14 +131,14 @@
 #define PIM_UPDATE_SOURCE_DUP           -10
 #define PIM_GROUP_BAD_ADDR_MASK_COMBO   -11
 
-const char *const PIM_ALL_SYSTEMS;
-const char *const PIM_ALL_ROUTERS;
-const char *const PIM_ALL_PIM_ROUTERS;
-const char *const PIM_ALL_IGMP_ROUTERS;
+extern const char *const PIM_ALL_SYSTEMS;
+extern const char *const PIM_ALL_ROUTERS;
+extern const char *const PIM_ALL_PIM_ROUTERS;
+extern const char *const PIM_ALL_IGMP_ROUTERS;
 
 extern struct pim_router *router;
 extern struct zebra_privs_t pimd_privs;
-struct in_addr qpim_all_pim_routers_addr;
+extern struct in_addr qpim_all_pim_routers_addr;
 extern uint8_t qpim_ecmp_enable;
 extern uint8_t qpim_ecmp_rebalance_enable;