From d6b01211b94d0f346a408eef78e04a8d0ffbb51f Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 14 Jun 2016 20:14:53 -0400
Subject: Resolve the remaining openssl "-Wredundant-decls" warnings.

Another part of 19406
---
 src/test/test_microdesc.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'src/test/test_microdesc.c')

diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c
index 581f58b45f..dbd1e5ac48 100644
--- 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>
-- 
cgit v1.2.3-54-g00ecf