Enable -Wredundant-decls.

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

2 files changed, 21 insertions, 10 deletions

diff --git a/extcap/extcap-base.c b/extcap/extcap-base.c
index 68c15ae57d..bc09aa6c54 100644
--- a/extcap/extcap-base.c
+++ b/extcap/extcap-base.c
@@ -19,13 +19,19 @@
 #include <string.h>
 #include <errno.h>
 
-#ifdef HAVE_GETOPT_H
-    #include <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
 
-#ifndef HAVE_GETOPT_LONG
-    #include "wsutil/wsgetopt.h"
-#endif
 #include "ws_attributes.h"
 
 enum extcap_options {
diff --git a/extcap/extcap-base.h b/extcap/extcap-base.h
index 11c4431093..20d4be31c3 100644
--- a/extcap/extcap-base.h
+++ b/extcap/extcap-base.h
@@ -19,12 +19,17 @@
 #include <stdlib.h>
 #include <stdint.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>
-#endif
-
-#ifndef HAVE_GETOPT_LONG
-	#include "wsutil/wsgetopt.h"
+#else
+	#include <wsutil/wsgetopt.h>
 #endif
 
 #ifdef _WIN32