Enable -Wredundant-decls.

Add it to the default list of checks, and fix some errors it causes.
(Sadly, it doesn't work in CLang.)

1 files changed, 11 insertions, 5 deletions

diff --git a/randpkt.c b/randpkt.c
index d97ef04e39..e4c05fe14a 100644
--- a/randpkt.c
+++ b/randpkt.c
@@ -27,12 +27,18 @@
 #endif
 
 #include <wsutil/report_message.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
 
-#ifndef HAVE_GETOPT_LONG
-#include "wsutil/wsgetopt.h"
+/*
+ * If we have getopt_long() in the system library, include <getopt.h>.
+ * Otherwise, we're using our own getopt_long() (either because the
+ * system has getopt() but not getopt_long(), as with some UN*Xes,
+ * or because it doesn't even have getopt(), as with Windows), so
+ * include our getopt_long()'s header.
+ */
+#ifdef HAVE_GETOPT_LONG
+#include <getopt.h>
+#else
+#include <wsutil/wsgetopt.h>
 #endif
 
 #include "randpkt_core/randpkt_core.h"