diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2018-10-01 14:55:06 +0200 | 
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-10-01 18:18:42 +0200 | 
| commit | 6243a7b569519e6a07562a6e4d1d95b93834117c (patch) | |
| tree | 1b2f6ad08f6cd10c78b4791722bf6ef382949894 /ospfd | |
| parent | d6e762570619f84318ade5b44fdeb2f920637f1f (diff) | |
ospfd: fix symbol collision
debug_init() was recently added in libfrr, which is now causing a build
error with static linking.
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_dump.c | 2 | ||||
| -rw-r--r-- | ospfd/ospf_dump.h | 2 | ||||
| -rw-r--r-- | ospfd/ospf_main.c | 2 | 
3 files changed, 3 insertions, 3 deletions
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index d8742943c0..48d210d279 100644 --- a/ospfd/ospf_dump.c +++ b/ospfd/ospf_dump.c @@ -1799,7 +1799,7 @@ static int config_write_debug(struct vty *vty)  }  /* Initialize debug commands. */ -void debug_init() +void ospf_debug_init(void)  {  	install_node(&debug_node, config_write_debug); diff --git a/ospfd/ospf_dump.h b/ospfd/ospf_dump.h index 99d7512f16..397f666f69 100644 --- a/ospfd/ospf_dump.h +++ b/ospfd/ospf_dump.h @@ -140,7 +140,7 @@ extern const char *ospf_timer_dump(struct thread *, char *, size_t);  extern const char *ospf_timeval_dump(struct timeval *, char *, size_t);  extern void ospf_ip_header_dump(struct ip *);  extern void ospf_packet_dump(struct stream *); -extern void debug_init(void); +extern void ospf_debug_init(void);  /* Appropriate buffer size to use with ospf_timer_dump and ospf_timeval_dump: */  #define OSPF_TIME_DUMP_SIZE	16 diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index 9fb0e0ad13..20632f2840 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -187,7 +187,7 @@ int main(int argc, char **argv)  	master = om->master;  	/* Library inits. */ -	debug_init(); +	ospf_debug_init();  	ospf_vrf_init();  	access_list_init();  | 
