Merge branch 'master' of github.com:borkmann/netsniff-ng

Needed to let Git merge to not run into conflicts with Tobias' set
of changes on ifpps resp. ifpps manpage.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/netsniff-ng.c b/netsniff-ng.c
index fe09c82..7070873 100644
--- a/netsniff-ng.c
+++ b/netsniff-ng.c
@@ -115,7 +115,7 @@ static void signal_handler(int number)
 	}
 }
 
-static void timer_elapsed(int unused)
+static void timer_elapsed(int unused __maybe_unused)
 {
 	int ret;
 
@@ -147,8 +147,7 @@ static void timer_purge(void)
 	setitimer(ITIMER_REAL, &itimer, NULL);
 }
 
-
-static void timer_next_dump(int unused)
+static void timer_next_dump(int unused __maybe_unused)
 {
 	set_itimer_interval_value(&itimer, interval, 0);
 	next_dump = true;