summaryrefslogtreecommitdiff
path: root/babeld/source.c
diff options
context:
space:
mode:
authorRenato Westphal <renato@opensourcerouting.org>2019-03-02 15:00:46 -0300
committerRenato Westphal <renatowestphal@gmail.com>2019-03-29 11:32:21 -0300
commit8f88441d717c0ded412543cceabf0ddd93ee9f09 (patch)
tree0a460d2da46a5b910535529c92e8db2fa5ff2a74 /babeld/source.c
parent6a534dcafcb623f1b85b5ee2a13c74faab227ced (diff)
parent700e9faa28bbdc3460e1d7aa109b6e4acaf347b3 (diff)
Merge remote-tracking branch 'frr/master' into rip-vrf
Merge commit to solve a bunch of conflicts with other PRs that were merged in the previous weeks. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'babeld/source.c')
-rw-r--r--babeld/source.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/babeld/source.c b/babeld/source.c
index ed165b41b4..2c303b624f 100644
--- a/babeld/source.c
+++ b/babeld/source.c
@@ -135,7 +135,7 @@ update_source(struct source *src,
}
void
-expire_sources()
+expire_sources(void)
{
struct source *src;