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, 10 insertions, 5 deletions

diff --git a/tshark.c b/tshark.c
index e1247c1537..0239c04f9b 100644
--- a/tshark.c
+++ b/tshark.c
@@ -18,8 +18,17 @@
 #include <locale.h>
 #include <limits.h>
 
-#ifdef HAVE_GETOPT_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 <errno.h>
@@ -32,10 +41,6 @@
 #include <signal.h>
 #endif
 
-#ifndef HAVE_GETOPT_LONG
-#include "wsutil/wsgetopt.h"
-#endif
-
 #include <glib.h>
 
 #include <epan/exceptions.h>