From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 10 Jan 2015 21:06:25 +0000 (-0500)
Subject: Ignore warning for redundant decl in openssl/srtp.h
X-Git-Tag: tor-0.2.6.3-alpha~185
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=740e592790f570c446cbb5e6d4a77f842f75d512;p=thirdparty%2Ftor.git

Ignore warning for redundant decl in openssl/srtp.h
---

diff --git a/src/common/tortls.c b/src/common/tortls.c
index dd33b330dc..ea6ee0dee4 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>