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>

1 files changed, 4 insertions, 4 deletions

diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c
index 0e9b09bf84..38387d38c3 100644
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@ -33,26 +33,26 @@
  * Signal handlers
  */
 
-static void pim_sighup()
+static void pim_sighup(void)
 {
 	zlog_info("SIGHUP received, ignoring");
 }
 
-static void pim_sigint()
+static void pim_sigint(void)
 {
 	zlog_notice("Terminating on signal SIGINT");
 	pim_terminate();
 	exit(1);
 }
 
-static void pim_sigterm()
+static void pim_sigterm(void)
 {
 	zlog_notice("Terminating on signal SIGTERM");
 	pim_terminate();
 	exit(1);
 }
 
-static void pim_sigusr1()
+static void pim_sigusr1(void)
 {
 	zlog_rotate();
 }