proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 22:26:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ldpd: Fix linking error on Fedora Rawhide with GCC 10

Browse Source 
GCC 10 switched to -fno-common by default, see
https://gcc.gnu.org/gcc-10/porting_to.html#common for details.

Fixes:
  CCLD     ldpd/ldpd
/usr/bin/ld: ldpd/libldp.a(adjacency.o):/home/ruben/src/frr/ldpd/ldpe.h:294: multiple definition of `pkt_ptr'; ldpd/ldpd.o:/home/ruben/src/frr/ldpd/ldpe.h:294: first defined here

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
This commit is contained in:
Ruben Kerkhof 2020-03-08 15:34:40 +01:00
parent a9bc84da46
commit 56b7d7252f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ldpd/ldpe.c
View File

@ -97,6 +97,8 @@ static struct quagga_signal_t ldpe_signals[] =
}, },
}; };
char *pkt_ptr; /* packet buffer */
/* label distribution protocol engine */ /* label distribution protocol engine */
void void
ldpe(void) ldpe(void)

2
ldpd/ldpe.h
View File

@ -291,7 +291,7 @@ struct tcp_conn *tcp_new(int, struct nbr *);
void pending_conn_del(struct pending_conn *); void pending_conn_del(struct pending_conn *);
struct pending_conn *pending_conn_find(int, union ldpd_addr *); struct pending_conn *pending_conn_find(int, union ldpd_addr *);
char *pkt_ptr; /* packet buffer */ extern char *pkt_ptr; /* packet buffer */
/* pfkey.c */ /* pfkey.c */
#ifdef __OpenBSD__ #ifdef __OpenBSD__