Resolve the remaining openssl "-Wredundant-decls" warnings.

Another part of 19406

diff --git a/src/common/aes.c b/src/common/aes.c
index c8a17c837fd03ab8bad01531068158a7a4feaaca..15970a73f0f5f7d92ad46b317e0a86907672d2fe 100644 (file)
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -23,6 +23,19 @@
 #error "We require OpenSSL >= 1.0.0"
 #endif
 
+#ifdef __GNUC__
+#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+#endif
+
+#if __GNUC__ && GCC_VERSION >= 402
+#if GCC_VERSION >= 406
+#pragma GCC diagnostic push
+#endif
+/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in
+ * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#endif
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,6 +43,15 @@
 #include <openssl/evp.h>
 #include <openssl/engine.h>
 #include <openssl/modes.h>
+
+#if __GNUC__ && GCC_VERSION >= 402
+#if GCC_VERSION >= 406
+#pragma GCC diagnostic pop
+#else
+#pragma GCC diagnostic warning "-Wredundant-decls"
+#endif
+#endif
+
 #include "compat.h"
 #include "aes.h"
 #include "util.h"

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 614f9b5de911ecdc6ca9ae9b7981d6697b848bdd..8d990d33457e6ffd4bae7a08548dd186f4e8e260 100644 (file)
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -29,6 +29,19 @@
 #include "crypto_ed25519.h"
 #include "crypto_format.h"
 
+#ifdef __GNUC__
+#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+#endif
+
+#if __GNUC__ && GCC_VERSION >= 402
+#if GCC_VERSION >= 406
+#pragma GCC diagnostic push
+#endif
+/* Some versions of OpenSSL declare X509_STORE_CTX_set_verify_cb twice.
+ * Suppress the GCC warning so we can build with -Wredundant-decl. */
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#endif
+
 #include <openssl/err.h>
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
@@ -40,6 +53,14 @@
 #include <openssl/conf.h>
 #include <openssl/hmac.h>
 
+#if __GNUC__ && GCC_VERSION >= 402
+#if GCC_VERSION >= 406
+#pragma GCC diagnostic pop
+#else
+#pragma GCC diagnostic warning "-Wredundant-decls"
+#endif
+#endif
+
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
 #endif

diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c
index 581f58b45f92c84a398291812989566227148dbf..dbd1e5ac48a5a4f8f86ac749adb39b5618dbe2ce 100644 (file)
--- a/src/test/test_microdesc.c
+++ b/src/test/test_microdesc.c
@@ -14,10 +14,31 @@
 
 #include "test.h"
 
+#ifdef __GNUC__
+#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+#endif
+
+#if __GNUC__ && GCC_VERSION >= 402
+#if GCC_VERSION >= 406
+#pragma GCC diagnostic push
+#endif
+/* Some versions of OpenSSL declare X509_STORE_CTX_set_verify_cb twice.
+ * Suppress the GCC warning so we can build with -Wredundant-decl. */
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#endif
+
 #include <openssl/rsa.h>
 #include <openssl/bn.h>
 #include <openssl/pem.h>
 
+#if __GNUC__ && GCC_VERSION >= 402
+#if GCC_VERSION >= 406
+#pragma GCC diagnostic pop
+#else
+#pragma GCC diagnostic warning "-Wredundant-decls"
+#endif
+#endif
+
 #ifdef _WIN32
 /* For mkdir() */
 #include <direct.h>