[tor-commits] [tor/master] Ignore warning for redundant decl in openssl/srtp.h

[nickm at torproject.org]

commit 740e592790f570c446cbb5e6d4a77f842f75d512
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jan 10 16:06:25 2015 -0500

    Ignore warning for redundant decl in openssl/srtp.h
---
 src/common/tortls.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index dd33b33..ea6ee0d 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -29,6 +29,14 @@
     #include <ws2tcpip.h>
  #endif
 #endif
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+/* 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 <openssl/ssl.h>
 #include <openssl/ssl3.h>
 #include <openssl/err.h>
@@ -37,6 +45,10 @@
 #include <openssl/bio.h>
 #include <openssl/opensslv.h>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #ifdef USE_BUFFEREVENTS
 #include <event2/bufferevent_ssl.h>
 #include <event2/buffer.h>