summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul>2005-09-09 23:49:49 +0000
committerpaul <paul>2005-09-09 23:49:49 +0000
commit1f8ae70b7b86d132b95a18f0c824deb248987afc (patch)
tree4d50ffd23b5e1e63a442e59c66c16227d06c4d33
parente7cd37bf334c6a4c0a3db6a0cfeb97674f820503 (diff)
2005-09-10 Paul Jakma <paul.jakma@sun.com>
* bgp_vty.c: (bgp_vty_init) gcc 4 compile fix. static function declarations shouldn't be inside functions. * bgp_dump.c: (bgp_dump_interval_add) ditto.
-rw-r--r--bgpd/ChangeLog6
-rw-r--r--bgpd/bgp_dump.c3
-rw-r--r--bgpd/bgp_vty.c4
3 files changed, 10 insertions, 3 deletions
diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 29d0fb0e..94eb596f 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-10 Paul Jakma <paul.jakma@sun.com>
+
+ * bgp_vty.c: (bgp_vty_init) gcc 4 compile fix. static
+ function declarations shouldn't be inside functions.
+ * bgp_dump.c: (bgp_dump_interval_add) ditto.
+
2005-08-26 Hasso Tepper <hasso at quagga.net>
* bgp_route.c: Third (?) attempt to fix best selection breakage
diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
index f5bb5f44..c350e83a 100644
--- a/bgpd/bgp_dump.c
+++ b/bgpd/bgp_dump.c
@@ -56,6 +56,8 @@ enum MRT_MSG_TYPES {
MSG_TABLE_DUMP /* routing table dump */
};
+static int bgp_dump_interval_func (struct thread *);
+
struct bgp_dump
{
enum bgp_dump_type type;
@@ -134,7 +136,6 @@ bgp_dump_open_file (struct bgp_dump *bgp_dump)
static int
bgp_dump_interval_add (struct bgp_dump *bgp_dump, int interval)
{
- static int bgp_dump_interval_func (struct thread *t);
int interval2, secs_into_day;
time_t t;
struct tm *tm;
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index e3642066..685ea28e 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -8583,11 +8583,11 @@ struct cmd_node bgp_vpnv4_node =
1
};
+static void community_list_vty (void);
+
void
bgp_vty_init (void)
{
- static void community_list_vty (void);
-
/* Install bgp top node. */
install_node (&bgp_node, bgp_config_write);
install_node (&bgp_ipv4_unicast_node, NULL);